提交 b5626946 编写于 作者: D David S. Miller

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: NDavid S. Miller <davem@davemloft.net>
上级 9cbc94ea
...@@ -833,7 +833,7 @@ void efx_link_set_advertising(struct efx_nic *efx, u32 advertising) ...@@ -833,7 +833,7 @@ void efx_link_set_advertising(struct efx_nic *efx, u32 advertising)
} }
} }
void efx_link_set_wanted_fc(struct efx_nic *efx, enum efx_fc_type wanted_fc) void efx_link_set_wanted_fc(struct efx_nic *efx, u8 wanted_fc)
{ {
efx->wanted_fc = wanted_fc; efx->wanted_fc = wanted_fc;
if (efx->link_advertising) { if (efx->link_advertising) {
......
...@@ -142,6 +142,6 @@ static inline void efx_schedule_channel(struct efx_channel *channel) ...@@ -142,6 +142,6 @@ static inline void efx_schedule_channel(struct efx_channel *channel)
extern void efx_link_status_changed(struct efx_nic *efx); extern void efx_link_status_changed(struct efx_nic *efx);
extern void efx_link_set_advertising(struct efx_nic *efx, u32); extern void efx_link_set_advertising(struct efx_nic *efx, u32);
extern void efx_link_set_wanted_fc(struct efx_nic *efx, enum efx_fc_type); extern void efx_link_set_wanted_fc(struct efx_nic *efx, u8);
#endif /* EFX_EFX_H */ #endif /* EFX_EFX_H */
...@@ -698,7 +698,7 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev, ...@@ -698,7 +698,7 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,
struct ethtool_pauseparam *pause) struct ethtool_pauseparam *pause)
{ {
struct efx_nic *efx = netdev_priv(net_dev); struct efx_nic *efx = netdev_priv(net_dev);
enum efx_fc_type wanted_fc, old_fc; u8 wanted_fc, old_fc;
u32 old_adv; u32 old_adv;
bool reset; bool reset;
int rc = 0; int rc = 0;
......
...@@ -284,7 +284,7 @@ void efx_mdio_an_reconfigure(struct efx_nic *efx) ...@@ -284,7 +284,7 @@ void efx_mdio_an_reconfigure(struct efx_nic *efx)
efx_mdio_write(efx, MDIO_MMD_AN, MDIO_CTRL1, reg); efx_mdio_write(efx, MDIO_MMD_AN, MDIO_CTRL1, reg);
} }
enum efx_fc_type efx_mdio_get_pause(struct efx_nic *efx) u8 efx_mdio_get_pause(struct efx_nic *efx)
{ {
BUILD_BUG_ON(EFX_FC_AUTO & (EFX_FC_RX | EFX_FC_TX)); BUILD_BUG_ON(EFX_FC_AUTO & (EFX_FC_RX | EFX_FC_TX));
......
...@@ -92,7 +92,7 @@ extern void efx_mdio_an_reconfigure(struct efx_nic *efx); ...@@ -92,7 +92,7 @@ extern void efx_mdio_an_reconfigure(struct efx_nic *efx);
/* Get pause parameters from AN if available (otherwise return /* Get pause parameters from AN if available (otherwise return
* requested pause parameters) * requested pause parameters)
*/ */
enum efx_fc_type efx_mdio_get_pause(struct efx_nic *efx); u8 efx_mdio_get_pause(struct efx_nic *efx);
/* Wait for specified MMDs to exit reset within a timeout */ /* Wait for specified MMDs to exit reset within a timeout */
extern int efx_mdio_wait_reset_mmds(struct efx_nic *efx, extern int efx_mdio_wait_reset_mmds(struct efx_nic *efx,
......
...@@ -449,11 +449,9 @@ enum nic_state { ...@@ -449,11 +449,9 @@ enum nic_state {
struct efx_nic; struct efx_nic;
/* Pseudo bit-mask flow control field */ /* Pseudo bit-mask flow control field */
enum efx_fc_type { #define EFX_FC_RX FLOW_CTRL_RX
EFX_FC_RX = FLOW_CTRL_RX, #define EFX_FC_TX FLOW_CTRL_TX
EFX_FC_TX = FLOW_CTRL_TX, #define EFX_FC_AUTO 4
EFX_FC_AUTO = 4,
};
/** /**
* struct efx_link_state - Current state of the link * struct efx_link_state - Current state of the link
...@@ -465,7 +463,7 @@ enum efx_fc_type { ...@@ -465,7 +463,7 @@ enum efx_fc_type {
struct efx_link_state { struct efx_link_state {
bool up; bool up;
bool fd; bool fd;
enum efx_fc_type fc; u8 fc;
unsigned int speed; unsigned int speed;
}; };
...@@ -784,7 +782,7 @@ struct efx_nic { ...@@ -784,7 +782,7 @@ struct efx_nic {
bool promiscuous; bool promiscuous;
union efx_multicast_hash multicast_hash; union efx_multicast_hash multicast_hash;
enum efx_fc_type wanted_fc; u8 wanted_fc;
atomic_t rx_reset; atomic_t rx_reset;
enum efx_loopback_mode loopback_mode; enum efx_loopback_mode loopback_mode;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册