aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/net_driver.h
diff options
context:
space:
mode:
authorSteve Hodgson <shodgson@solarflare.com>2009-11-28 00:34:44 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-29 02:58:51 -0500
commitab86746175a5e1379abb9c7c38522af4d3176f57 (patch)
tree785e6540facd6807909c24e827a61a1d441fc5bc /drivers/net/sfc/net_driver.h
parent47c3d19f60da7cc018781744b1ffb3b557373e7f (diff)
sfc: Replace MDIO spinlock with mutex
We never use MDIO in atomic context, so we don't need to spin. 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index fb9327c5ea57..0aeaeda9db7c 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -724,7 +724,7 @@ union efx_multicast_hash {
724 * @mac_op: MAC interface 724 * @mac_op: MAC interface
725 * @mac_address: Permanent MAC address 725 * @mac_address: Permanent MAC address
726 * @phy_type: PHY type 726 * @phy_type: PHY type
727 * @phy_lock: PHY access lock 727 * @mdio_lock: MDIO lock
728 * @phy_op: PHY interface 728 * @phy_op: PHY interface
729 * @phy_data: PHY private data (including PHY-specific stats) 729 * @phy_data: PHY private data (including PHY-specific stats)
730 * @mdio: PHY MDIO interface 730 * @mdio: PHY MDIO interface
@@ -806,7 +806,7 @@ struct efx_nic {
806 unsigned char mac_address[ETH_ALEN]; 806 unsigned char mac_address[ETH_ALEN];
807 807
808 enum phy_type phy_type; 808 enum phy_type phy_type;
809 spinlock_t phy_lock; 809 struct mutex mdio_lock;
810 struct efx_phy_operations *phy_op; 810 struct efx_phy_operations *phy_op;
811 void *phy_data; 811 void *phy_data;
812 struct mdio_if_info mdio; 812 struct mdio_if_info mdio;