diff options
author | Tom Herbert <therbert@google.com> | 2014-09-29 23:22:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-01 21:35:52 -0400 |
commit | 996c9fd167c99b382bcb9c1eb833b5b4711140ab (patch) | |
tree | aacc22b440766d6bdbda7b035962a7dcc590263c | |
parent | 54bc9bac307861aea5abb747cb58bf0275f2175f (diff) |
vxlan: Set inner protocol before transmit
Call skb_set_inner_protocol to set inner Ethernet protocol to
ETH_P_TEB before transmit. This is needed for GSO with UDP tunnels.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/vxlan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 34e102ec95c2..2af795d6ba05 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
@@ -1610,6 +1610,8 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs, | |||
1610 | vxh->vx_flags = htonl(VXLAN_FLAGS); | 1610 | vxh->vx_flags = htonl(VXLAN_FLAGS); |
1611 | vxh->vx_vni = vni; | 1611 | vxh->vx_vni = vni; |
1612 | 1612 | ||
1613 | skb_set_inner_protocol(skb, htons(ETH_P_TEB)); | ||
1614 | |||
1613 | udp_tunnel6_xmit_skb(vs->sock, dst, skb, dev, saddr, daddr, prio, | 1615 | udp_tunnel6_xmit_skb(vs->sock, dst, skb, dev, saddr, daddr, prio, |
1614 | ttl, src_port, dst_port); | 1616 | ttl, src_port, dst_port); |
1615 | return 0; | 1617 | return 0; |
@@ -1652,6 +1654,8 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, | |||
1652 | vxh->vx_flags = htonl(VXLAN_FLAGS); | 1654 | vxh->vx_flags = htonl(VXLAN_FLAGS); |
1653 | vxh->vx_vni = vni; | 1655 | vxh->vx_vni = vni; |
1654 | 1656 | ||
1657 | skb_set_inner_protocol(skb, htons(ETH_P_TEB)); | ||
1658 | |||
1655 | return udp_tunnel_xmit_skb(vs->sock, rt, skb, src, dst, tos, | 1659 | return udp_tunnel_xmit_skb(vs->sock, rt, skb, src, dst, tos, |
1656 | ttl, df, src_port, dst_port, xnet); | 1660 | ttl, df, src_port, dst_port, xnet); |
1657 | } | 1661 | } |