summaryrefslogtreecommitdiff
path: root/drivers/net/sfc/net_driver.h
diff options
context:
space:
mode:
authorSteve Hodgson <shodgson@solarflare.com>2009-11-28 05:34:44 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-28 23:58:51 -0800
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 {
* @mac_op: MAC interface
* @mac_address: Permanent MAC address
* @phy_type: PHY type
- * @phy_lock: PHY access lock
+ * @mdio_lock: MDIO lock
* @phy_op: PHY interface
* @phy_data: PHY private data (including PHY-specific stats)
* @mdio: PHY MDIO interface
@@ -806,7 +806,7 @@ struct efx_nic {
unsigned char mac_address[ETH_ALEN];
enum phy_type phy_type;
- spinlock_t phy_lock;
+ struct mutex mdio_lock;
struct efx_phy_operations *phy_op;
void *phy_data;
struct mdio_if_info mdio;