From: Andy Zhou Date: Tue, 23 Sep 2014 08:44:51 +0000 (-0700) Subject: vxlan: Fix bug introduced by commit acbf74a76300 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c4d1daecef875d28bdbe93587908c897c29ba71;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git vxlan: Fix bug introduced by commit acbf74a76300 Commit acbf74a76300 ("vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions." introduced a bug in vxlan_xmit_one() function, causing it to transmit Vxlan packets without proper Vxlan header inserted. The change was not needed in the first place. Revert it. Reported-by: Tom Herbert Cc: Eric Dumazet Signed-off-by: Andy Zhou Signed-off-by: David S. Miller --- diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 39c86536fb9b..34e102ec95c2 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1778,11 +1778,11 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, tos = ip_tunnel_ecn_encap(tos, old_iph, skb); ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); - err = udp_tunnel_xmit_skb(vxlan->vn_sock->sock, rt, skb, - fl4.saddr, dst->sin.sin_addr.s_addr, - tos, ttl, df, src_port, dst_port, - !net_eq(vxlan->net, - dev_net(vxlan->dev))); + err = vxlan_xmit_skb(vxlan->vn_sock, rt, skb, + fl4.saddr, dst->sin.sin_addr.s_addr, + tos, ttl, df, src_port, dst_port, + htonl(vni << 8), + !net_eq(vxlan->net, dev_net(vxlan->dev))); if (err < 0) goto rt_tx_error;