Commit f6773c5e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

vlan: propagate gso_max_segs 



vlan drivers lack proper propagation of gso_max_segs from
lower device.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4ab9d76

drivers/net/ipvlan/ipvlan_main.c

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static int ipvlan_init(struct net_device *dev) 
	dev->features = phy_dev->features & IPVLAN_FEATURES;

	dev->features |= NETIF_F_LLTX;

	dev->gso_max_size = phy_dev->gso_max_size;

	dev->gso_max_segs = phy_dev->gso_max_segs;

	dev->hard_header_len = phy_dev->hard_header_len;



	ipvlan_set_lockdep_class(dev);
@@ -592,6 +593,7 @@ static int ipvlan_device_event(struct notifier_block *unused, 
		list_for_each_entry(ipvlan, &port->ipvlans, pnode) {

			ipvlan->dev->features = dev->features & IPVLAN_FEATURES;

			ipvlan->dev->gso_max_size = dev->gso_max_size;

			ipvlan->dev->gso_max_segs = dev->gso_max_segs;

			netdev_features_change(ipvlan->dev);

		}

		break;

drivers/net/macvlan.c

+2 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ static int macvlan_init(struct net_device *dev) 
	dev->hw_features	|= NETIF_F_LRO;

	dev->vlan_features	= lowerdev->vlan_features & MACVLAN_FEATURES;

	dev->gso_max_size	= lowerdev->gso_max_size;

	dev->gso_max_segs	= lowerdev->gso_max_segs;

	dev->hard_header_len	= lowerdev->hard_header_len;



	macvlan_set_lockdep_class(dev);
@@ -1532,6 +1533,7 @@ static int macvlan_device_event(struct notifier_block *unused, 
	case NETDEV_FEAT_CHANGE:

		list_for_each_entry(vlan, &port->vlans, list) {

			vlan->dev->gso_max_size = dev->gso_max_size;

			vlan->dev->gso_max_segs = dev->gso_max_segs;

			netdev_update_features(vlan->dev);

		}

		break;

net/8021q/vlan.c

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static void vlan_transfer_features(struct net_device *dev, 
	struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);



	vlandev->gso_max_size = dev->gso_max_size;

	vlandev->gso_max_segs = dev->gso_max_segs;



	if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto))

		vlandev->hard_header_len = dev->hard_header_len;

net/8021q/vlan_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ static int vlan_dev_init(struct net_device *dev) 
	dev->features |= real_dev->vlan_features | NETIF_F_LLTX |

			 NETIF_F_GSO_SOFTWARE;

	dev->gso_max_size = real_dev->gso_max_size;

	dev->gso_max_segs = real_dev->gso_max_segs;

	if (dev->features & NETIF_F_VLAN_FEATURES)

		netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");