diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-02-16 15:59:06 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:30:48 -0500 |
| commit | 140e807dd7d6aa68e601f50a10abd5351e06126f (patch) | |
| tree | 4481f795dffd8db8fe1723200614018d06ac2815 /drivers/net/macb.c | |
| parent | daeafdc360f91d286490105e67b13f094381e23f (diff) | |
| download | linux-140e807dd7d6aa68e601f50a10abd5351e06126f.tar.gz linux-140e807dd7d6aa68e601f50a10abd5351e06126f.tar.bz2 linux-140e807dd7d6aa68e601f50a10abd5351e06126f.zip | |
macb: Remove inappropriate spinlocks around mii calls
Remove spin_lock_irqsave() around mii_ethtool_gset, mii_ethtool_sset
and generic_mii_ioctl. These are unnecessary and harmful because
the mii calls may call back into the mdio functions, which may sleep.
Pointed out by David Brownell.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index a41418b3c518..2e9571bf0736 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -881,27 +881,15 @@ static struct net_device_stats *macb_get_stats(struct net_device *dev) static int macb_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct macb *bp = netdev_priv(dev); - int ret; - unsigned long flags; - - spin_lock_irqsave(&bp->lock, flags); - ret = mii_ethtool_gset(&bp->mii, cmd); - spin_unlock_irqrestore(&bp->lock, flags); - return ret; + return mii_ethtool_gset(&bp->mii, cmd); } static int macb_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct macb *bp = netdev_priv(dev); - int ret; - unsigned long flags; - - spin_lock_irqsave(&bp->lock, flags); - ret = mii_ethtool_sset(&bp->mii, cmd); - spin_unlock_irqrestore(&bp->lock, flags); - return ret; + return mii_ethtool_sset(&bp->mii, cmd); } static void macb_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) @@ -930,17 +918,11 @@ static struct ethtool_ops macb_ethtool_ops = { static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct macb *bp = netdev_priv(dev); - int ret; - unsigned long flags; if (!netif_running(dev)) return -EINVAL; - spin_lock_irqsave(&bp->lock, flags); - ret = generic_mii_ioctl(&bp->mii, if_mii(rq), cmd, NULL); - spin_unlock_irqrestore(&bp->lock, flags); - - return ret; + return generic_mii_ioctl(&bp->mii, if_mii(rq), cmd, NULL); } static ssize_t macb_mii_show(const struct device *_dev, char *buf, |