]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
udptunnels: Call handle_offloads after inserting vlan tag.
authorJesse Gross <jesse@nicira.com>
Thu, 9 Apr 2015 18:19:14 +0000 (11:19 -0700)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 27 Apr 2015 21:13:41 +0000 (17:13 -0400)
commit218aa70e49b61fd49691a688309bdee22608c9bb
tree6cf9af20e9768ba36d62d4f71e6fe7016fa7d4eb
parent754a19948ec440acc781d3870d48329c802a6eb7
udptunnels: Call handle_offloads after inserting vlan tag.

[ Upstream commit b736a623bd099cdf5521ca9bd03559f3bc7fa31c ]

handle_offloads() calls skb_reset_inner_headers() to store
the layer pointers to the encapsulated packet. However, we
currently push the vlag tag (if there is one) onto the packet
afterwards. This changes the MAC header for the encapsulated
packet but it is not reflected in skb->inner_mac_header, which
breaks GSO and drivers which attempt to use this for encapsulation
offloads.

Fixes: 1eaa8178 ("vxlan: Add tx-vlan offload support.")
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/net/vxlan.c
net/ipv4/geneve.c