@@ -1198,6 +1198,31 @@ static void bond_attach_slave(struct bonding *bond, struct slave *new_slave)
bond->slave_cnt++;
}
+static void bond_set_gso_max_size(struct bonding *bond)
+{
+ struct slave *slave;
+ struct net_device *bond_dev = bond->dev;
+ unsigned int gso_max_size = 0;
+ bool reset_gso_size = true;
+ int i;
+
+ bond_for_each_slave(bond, slave, i) {
+ if (!slave->dev->gso_max_size)
+ continue;
+
+ reset_gso_size = false;
+
+ if (!gso_max_size ||
+ slave->dev->gso_max_size < gso_max_size)
+ gso_max_size = slave->dev->gso_max_size;
+ }
+
+ if (gso_max_size && gso_max_size < bond_dev->gso_max_size)
+ netif_set_gso_max_size(bond_dev, gso_max_size);
+ else if (reset_gso_size)
+ netif_set_gso_max_size(bond_dev, 0);
+}
+
/*
* This function detaches the slave from the list.
* WARNING: no check is made to verify if the slave effectively
@@ -1403,6 +1428,8 @@ done:
flags = bond_dev->priv_flags & ~IFF_XMIT_DST_RELEASE;
bond_dev->priv_flags = flags | dst_release_flag;
+ bond_set_gso_max_size(bond);
+
read_unlock(&bond->lock);
netdev_change_features(bond_dev);