From e1282cf1bcbfa35a5ccb52c29de81fb1360d6788 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 16 May 2013 07:34:53 +0000 Subject: [PATCH] --- yaml --- r: 376107 b: refs/heads/master c: b0ce3508b25ea6fa10ae3ca254de1d695b521702 h: refs/heads/master i: 376105: a983ca4436f0adbab2c1438f44fb3005ed0b221f 376103: a799020f19c30257cfd5a9e516b5166af680acba v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 1 + trunk/include/linux/netdevice.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9efcceafd58d..37c07f11727c 100644 --- 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 index d0aade04e49a..449ad9bbe45c 100644 --- 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 index a94a5a0ab122..60584b185a0c 100644 --- 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);