diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 00:50:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:58:17 -0500 |
commit | 04cc8cacb01c09fba2297faf1477cd570ba43f0b (patch) | |
tree | f17dbd584b072d14f1500c6f6d659be993ae35c7 /drivers/net/sfc/falcon_gmac.c | |
parent | 177dfcd80f28f8fbc3e22c2d8b24d21cb86f1d97 (diff) |
sfc: Implement auto-negotiation
Add infrastructure for auto-negotiation of speed, duplex and flow
control.
When using 10Xpress, auto-negotiate flow control. While we're
at it, clean up the code to warn when partner is not 10GBASE-T
capable.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon_gmac.c')
-rw-r--r-- | drivers/net/sfc/falcon_gmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon_gmac.c b/drivers/net/sfc/falcon_gmac.c index 247f8025ef00..b6e6eb963905 100644 --- a/drivers/net/sfc/falcon_gmac.c +++ b/drivers/net/sfc/falcon_gmac.c | |||
@@ -31,8 +31,8 @@ static void falcon_reconfigure_gmac(struct efx_nic *efx) | |||
31 | efx_oword_t reg; | 31 | efx_oword_t reg; |
32 | 32 | ||
33 | /* Configuration register 1 */ | 33 | /* Configuration register 1 */ |
34 | tx_fc = (efx->flow_control & EFX_FC_TX) || !efx->link_fd; | 34 | tx_fc = (efx->link_fc & EFX_FC_TX) || !efx->link_fd; |
35 | rx_fc = !!(efx->flow_control & EFX_FC_RX); | 35 | rx_fc = !!(efx->link_fc & EFX_FC_RX); |
36 | loopback = (efx->loopback_mode == LOOPBACK_GMAC); | 36 | loopback = (efx->loopback_mode == LOOPBACK_GMAC); |
37 | bytemode = (efx->link_speed == 1000); | 37 | bytemode = (efx->link_speed == 1000); |
38 | 38 | ||