vlan: propagate gso_max_segs

vlan drivers lack proper propagation of gso_max_segs from
lower device.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 5802b902576594240f39d12c8db0fee8fe707b4e..57941d3f42278407884ca4e442b5bbdf1c954ba4 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -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;

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 6e953e3a460a7f23d038ae2424b17930d325056a..2bcf1f321beaebbe028b7922a2c0495f59b12e70 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -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;

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 69929c05c8438e59c5205c72eb6d1b763e374b68..a1e273af6fc81660dfd5ad088cb5b0ee336d650d 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -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;

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index e416a4038a1293f71c12c28fd3ee9a8170950116..e7e62570bdb869f64e7198c53357e18702165bf1 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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");