diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-27 15:50:54 -0400 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-08-24 15:10:22 -0400 |
commit | 7bde852afc88909d78e617b70d3e7a3dc6bc04ff (patch) | |
tree | 96f2ff4d96c7f17b7c106a9370472eb6766c77cf /drivers/net/ethernet/sfc/efx.c | |
parent | 7153f623ea47f3feb54209d75b80ed09a497cd4a (diff) |
sfc: Remove overly paranoid locking assertions from netdev operations
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index d0653406058b..b29db12756f9 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -1767,8 +1767,6 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd) | |||
1767 | struct efx_nic *efx = netdev_priv(net_dev); | 1767 | struct efx_nic *efx = netdev_priv(net_dev); |
1768 | struct mii_ioctl_data *data = if_mii(ifr); | 1768 | struct mii_ioctl_data *data = if_mii(ifr); |
1769 | 1769 | ||
1770 | EFX_ASSERT_RESET_SERIALISED(efx); | ||
1771 | |||
1772 | /* Convert phy_id from older PRTAD/DEVAD format */ | 1770 | /* Convert phy_id from older PRTAD/DEVAD format */ |
1773 | if ((cmd == SIOCGMIIREG || cmd == SIOCSMIIREG) && | 1771 | if ((cmd == SIOCGMIIREG || cmd == SIOCSMIIREG) && |
1774 | (data->phy_id & 0xfc00) == 0x0400) | 1772 | (data->phy_id & 0xfc00) == 0x0400) |
@@ -1850,8 +1848,6 @@ static int efx_net_open(struct net_device *net_dev) | |||
1850 | struct efx_nic *efx = netdev_priv(net_dev); | 1848 | struct efx_nic *efx = netdev_priv(net_dev); |
1851 | int rc; | 1849 | int rc; |
1852 | 1850 | ||
1853 | EFX_ASSERT_RESET_SERIALISED(efx); | ||
1854 | |||
1855 | netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n", | 1851 | netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n", |
1856 | raw_smp_processor_id()); | 1852 | raw_smp_processor_id()); |
1857 | 1853 | ||
@@ -1946,8 +1942,6 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu) | |||
1946 | struct efx_nic *efx = netdev_priv(net_dev); | 1942 | struct efx_nic *efx = netdev_priv(net_dev); |
1947 | int rc; | 1943 | int rc; |
1948 | 1944 | ||
1949 | EFX_ASSERT_RESET_SERIALISED(efx); | ||
1950 | |||
1951 | rc = efx_check_disabled(efx); | 1945 | rc = efx_check_disabled(efx); |
1952 | if (rc) | 1946 | if (rc) |
1953 | return rc; | 1947 | return rc; |
@@ -1975,8 +1969,6 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data) | |||
1975 | struct sockaddr *addr = data; | 1969 | struct sockaddr *addr = data; |
1976 | char *new_addr = addr->sa_data; | 1970 | char *new_addr = addr->sa_data; |
1977 | 1971 | ||
1978 | EFX_ASSERT_RESET_SERIALISED(efx); | ||
1979 | |||
1980 | if (!is_valid_ether_addr(new_addr)) { | 1972 | if (!is_valid_ether_addr(new_addr)) { |
1981 | netif_err(efx, drv, efx->net_dev, | 1973 | netif_err(efx, drv, efx->net_dev, |
1982 | "invalid ethernet MAC address requested: %pM\n", | 1974 | "invalid ethernet MAC address requested: %pM\n", |