diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-23 07:30:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-25 01:13:22 -0400 |
commit | 62776d034cc40c49bafdb3551a6ba35f78e3f08d (patch) | |
tree | 1cd2132940ced266ad53619a0c947e153cc83a5e /drivers/net/sfc/falcon_xmac.c | |
parent | 0c605a2061670412d3b5580c92f1e161b1a693d2 (diff) |
sfc: Implement message level control
Replace EFX_ERR() with netif_err(), EFX_INFO() with netif_info(),
EFX_LOG() with netif_dbg() and EFX_TRACE() and EFX_REGDUMP() with
netif_vdbg().
Replace EFX_ERR_RL(), EFX_INFO_RL() and EFX_LOG_RL() using explicit
calls to net_ratelimit().
Implement the ethtool operations to get and set message level flags,
and add a 'debug' module parameter for the initial value.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon_xmac.c')
-rw-r--r-- | drivers/net/sfc/falcon_xmac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c index c84a2ce2ccbb..bae656dd2c4e 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/sfc/falcon_xmac.c | |||
@@ -81,7 +81,8 @@ int falcon_reset_xaui(struct efx_nic *efx) | |||
81 | } | 81 | } |
82 | udelay(10); | 82 | udelay(10); |
83 | } | 83 | } |
84 | EFX_ERR(efx, "timed out waiting for XAUI/XGXS reset\n"); | 84 | netif_err(efx, hw, efx->net_dev, |
85 | "timed out waiting for XAUI/XGXS reset\n"); | ||
85 | return -ETIMEDOUT; | 86 | return -ETIMEDOUT; |
86 | } | 87 | } |
87 | 88 | ||
@@ -256,7 +257,7 @@ static bool falcon_xmac_link_ok_retry(struct efx_nic *efx, int tries) | |||
256 | falcon_stop_nic_stats(efx); | 257 | falcon_stop_nic_stats(efx); |
257 | 258 | ||
258 | while (!mac_up && tries) { | 259 | while (!mac_up && tries) { |
259 | EFX_LOG(efx, "bashing xaui\n"); | 260 | netif_dbg(efx, hw, efx->net_dev, "bashing xaui\n"); |
260 | falcon_reset_xaui(efx); | 261 | falcon_reset_xaui(efx); |
261 | udelay(200); | 262 | udelay(200); |
262 | 263 | ||