diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-17 17:53:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-17 17:53:22 -0400 |
commit | b56269468483a0255a27126ebc2ae7e321638d7b (patch) | |
tree | 11666efc904d51458fc2f79629ef66fb179d449c /drivers/net/sfc/net_driver.h | |
parent | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (diff) |
sfc: Don't use enums as a bitmask.
This fixes:
drivers/net/sfc/mcdi_mac.c: In function ‘efx_mcdi_set_mac’:
drivers/net/sfc/mcdi_mac.c:36:2: warning: case value ‘3’ not in enumerated type ‘enum efx_fc_type’
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index ce9697bac1b9..e8d5f03a89fe 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -449,11 +449,9 @@ enum nic_state { | |||
449 | struct efx_nic; | 449 | struct efx_nic; |
450 | 450 | ||
451 | /* Pseudo bit-mask flow control field */ | 451 | /* Pseudo bit-mask flow control field */ |
452 | enum efx_fc_type { | 452 | #define EFX_FC_RX FLOW_CTRL_RX |
453 | EFX_FC_RX = FLOW_CTRL_RX, | 453 | #define EFX_FC_TX FLOW_CTRL_TX |
454 | EFX_FC_TX = FLOW_CTRL_TX, | 454 | #define EFX_FC_AUTO 4 |
455 | EFX_FC_AUTO = 4, | ||
456 | }; | ||
457 | 455 | ||
458 | /** | 456 | /** |
459 | * struct efx_link_state - Current state of the link | 457 | * struct efx_link_state - Current state of the link |
@@ -465,7 +463,7 @@ enum efx_fc_type { | |||
465 | struct efx_link_state { | 463 | struct efx_link_state { |
466 | bool up; | 464 | bool up; |
467 | bool fd; | 465 | bool fd; |
468 | enum efx_fc_type fc; | 466 | u8 fc; |
469 | unsigned int speed; | 467 | unsigned int speed; |
470 | }; | 468 | }; |
471 | 469 | ||
@@ -784,7 +782,7 @@ struct efx_nic { | |||
784 | 782 | ||
785 | bool promiscuous; | 783 | bool promiscuous; |
786 | union efx_multicast_hash multicast_hash; | 784 | union efx_multicast_hash multicast_hash; |
787 | enum efx_fc_type wanted_fc; | 785 | u8 wanted_fc; |
788 | 786 | ||
789 | atomic_t rx_reset; | 787 | atomic_t rx_reset; |
790 | enum efx_loopback_mode loopback_mode; | 788 | enum efx_loopback_mode loopback_mode; |