diff options
| author |   Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-12 09:38:23 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-04-12 14:50:44 -0700 |
| commit | 66371c44136b566f39f70c72cb4d117558bee3fa (patch) | |
| tree | 0976d78d048da3c8bddba3a177b42e35c78d070b /drivers/net/bnx2x/bnx2x.h | |
| parent | net: bna: convert to hw_features (diff) | |
| download | linux-dev-66371c44136b566f39f70c72cb4d117558bee3fa.tar.xz linux-dev-66371c44136b566f39f70c72cb4d117558bee3fa.zip | |
net: bnx2x: convert to hw_features
Since ndo_fix_features callback is postponing features change when
bp->recovery_state != BNX2X_RECOVERY_DONE, netdev_update_features()
has to be called again when this condition changes. Previously,
ethtool_ops->set_flags callback returned -EBUSY in that case
(it's not possible in the new model).
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
v5: - don't delay set_features, as it's rtnl_locked - same as recovery process
v4: - complete bp->rx_csum -> NETIF_F_RXCSUM conversion
- add check for failed ndo_set_features in ndo_open callback
v3: - include NETIF_F_LRO in hw_features
- don't call netdev_update_features() if bnx2x_nic_load() failed
v2: - comment in ndo_fix_features callback
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index e0fca701d2f3..9e87417f6ec7 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -918,7 +918,6 @@ struct bnx2x { int tx_ring_size; - u32 rx_csum; /* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */ #define ETH_OVREHEAD (ETH_HLEN + 8 + 8) #define ETH_MIN_PACKET_SIZE 60 |