Part of upstream commit 4bbb3e0e8239 ("net: Fix vlan untag for bridge and vlan_dev with reorder_hdr off") Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>