summaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/nic.h
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-02 13:47:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-03 09:08:08 -0800
commit4833f02a2972b7da4c8a15e1e329db0f984a75d9 (patch)
treed23e8b733fb02507b6894d632270dcb0435e6890 /drivers/net/sfc/nic.h
parent4de92180258ac661bbce0f0065c9c81633ac862b (diff)
downloadlinux-stable-4833f02a2972b7da4c8a15e1e329db0f984a75d9.tar.gz
linux-stable-4833f02a2972b7da4c8a15e1e329db0f984a75d9.tar.bz2
linux-stable-4833f02a2972b7da4c8a15e1e329db0f984a75d9.zip
sfc: Move mdio_lock to struct falcon_nic_data
We only have direct access to MDIO on Falcon, so move this out of struct efx_nic. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/nic.h')
-rw-r--r--drivers/net/sfc/nic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h
index 2a0fff324f1f..980cf4b5a868 100644
--- a/drivers/net/sfc/nic.h
+++ b/drivers/net/sfc/nic.h
@@ -117,6 +117,7 @@ struct falcon_board {
* @spi_flash: SPI flash device
* @spi_eeprom: SPI EEPROM device
* @spi_lock: SPI bus lock
+ * @mdio_lock: MDIO bus lock
*/
struct falcon_nic_data {
struct pci_dev *pci_dev2;
@@ -128,6 +129,7 @@ struct falcon_nic_data {
struct efx_spi_device spi_flash;
struct efx_spi_device spi_eeprom;
struct mutex spi_lock;
+ struct mutex mdio_lock;
};
static inline struct falcon_board *falcon_board(struct efx_nic *efx)