aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/net_driver.h
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-12-13 00:43:33 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-13 00:57:57 -0500
commitf31a45d2f45a7667acd6e85ab6613b0910c55ea9 (patch)
tree0462d02420800b22af5291db8a210888da9e2683 /drivers/net/sfc/net_driver.h
parent5005087728e37db133fee05bb0923c50e673ae99 (diff)
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.h6
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 {
694 * @mii: PHY interface 694 * @mii: PHY interface
695 * @phy_mode: PHY operating mode. Serialised by @mac_lock. 695 * @phy_mode: PHY operating mode. Serialised by @mac_lock.
696 * @link_up: Link status 696 * @link_up: Link status
697 * @link_options: Link options (MII/GMII format) 697 * @link_fd: Link is full duplex
698 * @link_speed: Link speed (Mbps)
698 * @n_link_state_changes: Number of times the link has changed state 699 * @n_link_state_changes: Number of times the link has changed state
699 * @promiscuous: Promiscuous flag. Protected by netif_tx_lock. 700 * @promiscuous: Promiscuous flag. Protected by netif_tx_lock.
700 * @multicast_hash: Multicast hash table 701 * @multicast_hash: Multicast hash table
@@ -772,7 +773,8 @@ struct efx_nic {
772 enum efx_phy_mode phy_mode; 773 enum efx_phy_mode phy_mode;
773 774
774 bool link_up; 775 bool link_up;
775 unsigned int link_options; 776 bool link_fd;
777 unsigned int link_speed;
776 unsigned int n_link_state_changes; 778 unsigned int n_link_state_changes;
777 779
778 bool promiscuous; 780 bool promiscuous;