diff options
author | Steve Hodgson <shodgson@solarflare.com> | 2010-02-03 04:30:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-03 22:12:44 -0500 |
commit | 7a6b8f6f7f74085a1330b0f9765d81bcea8c58b7 (patch) | |
tree | 6358e7e8d94d3475c864c114188df2c6eb4a98ff /drivers/net/sfc/siena.c | |
parent | 8b2103add08b79abd3ac7015b4bac744c0af534e (diff) |
sfc: Enable autonegotiated flow-control by default if supported
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/siena.c')
-rw-r--r-- | drivers/net/sfc/siena.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c index 0e4c13abf087..f6a53895ff27 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/sfc/siena.c | |||
@@ -106,16 +106,11 @@ static int siena_probe_port(struct efx_nic *efx) | |||
106 | efx->mdio.mdio_read = siena_mdio_read; | 106 | efx->mdio.mdio_read = siena_mdio_read; |
107 | efx->mdio.mdio_write = siena_mdio_write; | 107 | efx->mdio.mdio_write = siena_mdio_write; |
108 | 108 | ||
109 | /* Fill out MDIO structure and loopback modes */ | 109 | /* Fill out MDIO structure, loopback modes, and initial link state */ |
110 | rc = efx->phy_op->probe(efx); | 110 | rc = efx->phy_op->probe(efx); |
111 | if (rc != 0) | 111 | if (rc != 0) |
112 | return rc; | 112 | return rc; |
113 | 113 | ||
114 | /* Initial assumption */ | ||
115 | efx->link_state.speed = 10000; | ||
116 | efx->link_state.fd = true; | ||
117 | efx->wanted_fc = EFX_FC_RX | EFX_FC_TX; | ||
118 | |||
119 | /* Allocate buffer for stats */ | 114 | /* Allocate buffer for stats */ |
120 | rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer, | 115 | rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer, |
121 | MC_CMD_MAC_NSTATS * sizeof(u64)); | 116 | MC_CMD_MAC_NSTATS * sizeof(u64)); |