---

yaml --- r: 376107 b: refs/heads/master c: b0ce350 h: refs/heads/master i: 376105: a983ca4 376103: a799020 v: v3
git-mirror · May 16, 2013 · e1282cf · e1282cf
1 parent 3dc32c6
commit e1282cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aefe2b4a8003517d6e15112f806fd4069785389
+refs/heads/master: b0ce3508b25ea6fa10ae3ca254de1d695b521702
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1362,6 +1362,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
 						     slave->dev->features,
 						     mask);
 	}
+	features = netdev_add_tso_features(features, mask);
 
 out:
 	read_unlock(&bond->lock);

diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -2733,6 +2733,17 @@ static inline netdev_features_t netdev_get_wanted_features(
 }
 netdev_features_t netdev_increment_features(netdev_features_t all,
 	netdev_features_t one, netdev_features_t mask);
+
+/* Allow TSO being used on stacked device :
+ * Performing the GSO segmentation before last device
+ * is a performance improvement.
+ */
+static inline netdev_features_t netdev_add_tso_features(netdev_features_t features,
+							netdev_features_t mask)
+{
+	return netdev_increment_features(features, NETIF_F_ALL_TSO, mask);
+}
+
 int __netdev_update_features(struct net_device *dev);
 void netdev_update_features(struct net_device *dev);
 void netdev_change_features(struct net_device *dev);
-Original file line number
+Diff line change
@@ Expand Up @@
     						     slave->dev->features,
     						     mask);
     	}
+    	features = netdev_add_tso_features(features, mask);
     out:
     	read_unlock(&bond->lock);
@@ Expand Down @@