diff options
author | Eilon Greenstein <eilong@broadcom.com> | 2009-10-15 03:18:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-15 03:18:08 -0400 |
commit | f34d28ea0174df63253dc20a95de0b48e3d8145a (patch) | |
tree | f3a1617b224b1305f6090ed05c33e16c136d8eb7 /drivers/net/bnx2x.h | |
parent | 52a7a12fb560f22dd093ca74f3a768d51b044a40 (diff) |
bnx2x: Changing the Disabled state to a flag
When working with DCC, a function can be disabled or enabled (virtual link down
or up). Using the function state introduced some race conditions with the
load/unload flow.
Using a separate flag to indicate that the function is disabled.
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.h')
-rw-r--r-- | drivers/net/bnx2x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 60fa14f31d73..185a6bab2227 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h | |||
@@ -900,6 +900,7 @@ struct bnx2x { | |||
900 | #define BP_NOMCP(bp) (bp->flags & NO_MCP_FLAG) | 900 | #define BP_NOMCP(bp) (bp->flags & NO_MCP_FLAG) |
901 | #define HW_VLAN_TX_FLAG 0x400 | 901 | #define HW_VLAN_TX_FLAG 0x400 |
902 | #define HW_VLAN_RX_FLAG 0x800 | 902 | #define HW_VLAN_RX_FLAG 0x800 |
903 | #define MF_FUNC_DIS 0x1000 | ||
903 | 904 | ||
904 | int func; | 905 | int func; |
905 | #define BP_PORT(bp) (bp->func % PORT_MAX) | 906 | #define BP_PORT(bp) (bp->func % PORT_MAX) |
@@ -965,7 +966,6 @@ struct bnx2x { | |||
965 | #define BNX2X_STATE_CLOSING_WAIT4_HALT 0x4000 | 966 | #define BNX2X_STATE_CLOSING_WAIT4_HALT 0x4000 |
966 | #define BNX2X_STATE_CLOSING_WAIT4_DELETE 0x5000 | 967 | #define BNX2X_STATE_CLOSING_WAIT4_DELETE 0x5000 |
967 | #define BNX2X_STATE_CLOSING_WAIT4_UNLOAD 0x6000 | 968 | #define BNX2X_STATE_CLOSING_WAIT4_UNLOAD 0x6000 |
968 | #define BNX2X_STATE_DISABLED 0xd000 | ||
969 | #define BNX2X_STATE_DIAG 0xe000 | 969 | #define BNX2X_STATE_DIAG 0xe000 |
970 | #define BNX2X_STATE_ERROR 0xf000 | 970 | #define BNX2X_STATE_ERROR 0xf000 |
971 | 971 | ||