diff options
| author | Michal Schmidt | 2015-04-28 11:34:21 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-04-29 20:48:35 +0200 |
| commit | d9b9e860cef1d904832bc6e92e444adfeabe49e9 (patch) | |
| tree | 8c90aa1104f25ca2a1496a541c4f5986c0c97335 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | hv_netvsc: introduce netif-msg into netvsc module (diff) | |
| download | kernel-qcow2-linux-d9b9e860cef1d904832bc6e92e444adfeabe49e9.tar.gz kernel-qcow2-linux-d9b9e860cef1d904832bc6e92e444adfeabe49e9.tar.xz kernel-qcow2-linux-d9b9e860cef1d904832bc6e92e444adfeabe49e9.zip | |
bnx2x: mark LRO as a fixed disabled feature if disable_tpa is set
If disable_tpa is set, remove NETIF_F_LRO from hw_features, so ethtool sees
it as "off [fixed]".
Note that setting the NETIF_F_LRO bit in dev->features in the 'else'
branch is not needed, because the bit was already set by
bnx2x_init_dev().
Then the check for disable_tpa in in bnx2x_fix_features() becomes unnecessary.
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 3558a36b1c2d..dcdbd00d0259 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -4834,10 +4834,6 @@ netdev_features_t bnx2x_fix_features(struct net_device *dev, features &= ~NETIF_F_GRO; } - /* Note: do not disable SW GRO in kernel when HW GRO is off */ - if (bp->disable_tpa) - features &= ~NETIF_F_LRO; - return features; } |