vxlan: consolidate GBP handling even more