diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-17 02:45:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-17 02:54:23 -0500 |
commit | f6d52432a4bc6da5de2a0bbb350f735db3206aa5 (patch) | |
tree | c04b76071b57bd461d826cc1ec0384911f66d429 /drivers/net | |
parent | 1f2435e532bd64742c3f766b7d5c17cc9d0b8558 (diff) |
bnx2: Don't redefine FLOW_CTRL_{RX,TX}.
They are provided generically by linux/mii.h now.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bnx2.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 88f962bff2d3..900641ac63e0 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -6848,9 +6848,6 @@ struct bnx2 { | |||
6848 | u8 flow_ctrl; /* actual flow ctrl settings */ | 6848 | u8 flow_ctrl; /* actual flow ctrl settings */ |
6849 | /* may be different from */ | 6849 | /* may be different from */ |
6850 | /* req_flow_ctrl if autoneg */ | 6850 | /* req_flow_ctrl if autoneg */ |
6851 | #define FLOW_CTRL_TX 1 | ||
6852 | #define FLOW_CTRL_RX 2 | ||
6853 | |||
6854 | u32 advertising; | 6851 | u32 advertising; |
6855 | 6852 | ||
6856 | u8 req_flow_ctrl; /* flow ctrl advertisement */ | 6853 | u8 req_flow_ctrl; /* flow ctrl advertisement */ |