diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-12 21:43:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-12 21:57:57 -0800 |
| commit | f31a45d2f45a7667acd6e85ab6613b0910c55ea9 (patch) | |
| tree | 0462d02420800b22af5291db8a210888da9e2683 /drivers/net/sfc/net_driver.h | |
| parent | 5005087728e37db133fee05bb0923c50e673ae99 (diff) | |
| download | lwn-f31a45d2f45a7667acd6e85ab6613b0910c55ea9.tar.gz lwn-f31a45d2f45a7667acd6e85ab6613b0910c55ea9.zip | |
sfc: Remove MII extension cruft
Replace efx_nic::link_options bitfield with link_speed (speed in
Mbit/s) and link_fd (full duplex flag).
Remove broken auto-negotiation functions.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index abff9084a986..6cac5ed427ba 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -694,7 +694,8 @@ union efx_multicast_hash { * @mii: PHY interface * @phy_mode: PHY operating mode. Serialised by @mac_lock. * @link_up: Link status - * @link_options: Link options (MII/GMII format) + * @link_fd: Link is full duplex + * @link_speed: Link speed (Mbps) * @n_link_state_changes: Number of times the link has changed state * @promiscuous: Promiscuous flag. Protected by netif_tx_lock. * @multicast_hash: Multicast hash table @@ -772,7 +773,8 @@ struct efx_nic { enum efx_phy_mode phy_mode; bool link_up; - unsigned int link_options; + bool link_fd; + unsigned int link_speed; unsigned int n_link_state_changes; bool promiscuous; |