Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2853af6a authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

vxlan: use dev->needed_headroom instead of dev->hard_header_len 



When we mirror packets from a vxlan tunnel to other device,
the mirror device should see the same packets (that is, without
outer header). Because vxlan tunnel sets dev->hard_header_len,
tcf_mirred() resets mac header back to outer mac, the mirror device
actually sees packets with outer headers

Vxlan tunnel should set dev->needed_headroom instead of
dev->hard_header_len, like what other ip tunnels do. This fixes
the above problem.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: stephen hemminger <stephen@networkplumber.org>
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56f16c74

drivers/net/vxlan.c

+3 −4
Original line number Diff line number Diff line
@@ -2247,9 +2247,9 @@ static void vxlan_setup(struct net_device *dev) 
	eth_hw_addr_random(dev);

	ether_setup(dev);

	if (vxlan->default_dst.remote_ip.sa.sa_family == AF_INET6)

		dev->hard_header_len = ETH_HLEN + VXLAN6_HEADROOM;

		dev->needed_headroom = ETH_HLEN + VXLAN6_HEADROOM;

	else

		dev->hard_header_len = ETH_HLEN + VXLAN_HEADROOM;

		dev->needed_headroom = ETH_HLEN + VXLAN_HEADROOM;



	dev->netdev_ops = &vxlan_netdev_ops;

	dev->destructor = free_netdev;
@@ -2646,8 +2646,7 @@ static int vxlan_newlink(struct net *net, struct net_device *dev, 
		if (!tb[IFLA_MTU])

			dev->mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM);



		/* update header length based on lower device */

		dev->hard_header_len = lowerdev->hard_header_len +

		dev->needed_headroom = lowerdev->hard_header_len +

				       (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM);

	} else if (use_ipv6)

		vxlan->flags |= VXLAN_F_IPV6;