From: Miaohe Lin <linmia...@huawei.com> Date: Sat, 15 Aug 2020 04:44:31 -0400
> We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). So
> we should pull VLAN_HLEN + sizeof(unsigned short) in skb_vlan_untag() or
> we may access the wrong data.
>
> Fixes: 0d5501c1c828 ("net: Always untag vlan-tagged traffic on input.")
> Signed-off-by: Miaohe Lin <linmia...@huawei.com>
Applied, thank you.
