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

Commit 82c80e9d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'macvlan' 



Michal Kubecek says:

====================
macvlan: disable LRO on lowerdev instead of a macvlan

A customer of ours encountered a problem with LRO on an ixgbe network
card. Analysis showed that it was a known conflict of forwarding and LRO
but the forwarding was enabled in an LXC container where only a macvlan
was, not the ethernet device itself.

I believe the solution is exactly the same as what we do for "normal"
(802.1q) VLAN devices: if dev_disable_lro() is called for such device,
LRO is disabled on the underlying "real" device instead.

v2: adapt to changes merged from net-next

v3: use BUG() in macvlan_dev_real_dev() if compiled without macvlan
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f9de11a1 529d0489

include/linux/if_macvlan.h

+17 −0
Original line number Diff line number Diff line
@@ -119,4 +119,21 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops); 
extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,

				      struct net_device *dev);



#if IS_ENABLED(CONFIG_MACVLAN)

static inline struct net_device *

macvlan_dev_real_dev(const struct net_device *dev)

{

	struct macvlan_dev *macvlan = netdev_priv(dev);



	return macvlan->lowerdev;

}

#else

static inline struct net_device *

macvlan_dev_real_dev(const struct net_device *dev)

{

	BUG();

	return NULL;

}

#endif



#endif /* _LINUX_IF_MACVLAN_H */

net/core/dev.c

+5 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
#include <linux/static_key.h>

#include <linux/hashtable.h>

#include <linux/vmalloc.h>

#include <linux/if_macvlan.h>



#include "net-sysfs.h"
@@ -1424,6 +1425,10 @@ void dev_disable_lro(struct net_device *dev) 
	if (is_vlan_dev(dev))

		dev = vlan_dev_real_dev(dev);



	/* the same for macvlan devices */

	if (netif_is_macvlan(dev))

		dev = macvlan_dev_real_dev(dev);



	dev->wanted_features &= ~NETIF_F_LRO;

	netdev_update_features(dev);