diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-05-16 09:34:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-17 00:02:01 +0200 |
| commit | b0ce3508b25ea6fa10ae3ca254de1d695b521702 (patch) | |
| tree | d5158ba0fe71d3807c563148c6cddb3757e7f348 /drivers/net | |
| parent | NET: mv643xx_eth: avoid lockdep dump on interface down (diff) | |
| download | linux-b0ce3508b25ea6fa10ae3ca254de1d695b521702.tar.xz linux-b0ce3508b25ea6fa10ae3ca254de1d695b521702.zip | |
bonding: allow TSO being set on bonding master
In some situations, we need to disable TSO on bonding slaves.
bonding device automatically unset TSO in bond_fix_features(), and
performance is not good because :
1) We consume more cpu cycles.
2) GSO segmentation has some bugs leading to out of order TCP packets
if this segmentation is done before virtual device. This particular
problem will be addressed in a separate patch.
This patch allows TSO being set/unset on the bonding master,
so that GSO segmentation is done after bonding layer.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Michał Mirosław <mirqus@gmail.com>
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Maciej Żenczykowski <maze@google.com>
Cc: Tom Herbert <therbert@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index d0aade04e49a..449ad9bbe45c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/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); |