diff options
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index c53848f787eb..7aa49b974dc5 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -28,8 +28,8 @@ | |||
28 | 28 | ||
29 | #define DRV_MODULE_NAME "b44" | 29 | #define DRV_MODULE_NAME "b44" |
30 | #define PFX DRV_MODULE_NAME ": " | 30 | #define PFX DRV_MODULE_NAME ": " |
31 | #define DRV_MODULE_VERSION "0.96" | 31 | #define DRV_MODULE_VERSION "0.97" |
32 | #define DRV_MODULE_RELDATE "Nov 8, 2005" | 32 | #define DRV_MODULE_RELDATE "Nov 30, 2005" |
33 | 33 | ||
34 | #define B44_DEF_MSG_ENABLE \ | 34 | #define B44_DEF_MSG_ENABLE \ |
35 | (NETIF_MSG_DRV | \ | 35 | (NETIF_MSG_DRV | \ |
@@ -1417,6 +1417,7 @@ static int b44_open(struct net_device *dev) | |||
1417 | add_timer(&bp->timer); | 1417 | add_timer(&bp->timer); |
1418 | 1418 | ||
1419 | b44_enable_ints(bp); | 1419 | b44_enable_ints(bp); |
1420 | netif_start_queue(dev); | ||
1420 | out: | 1421 | out: |
1421 | return err; | 1422 | return err; |
1422 | } | 1423 | } |
@@ -1837,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
1837 | { | 1838 | { |
1838 | struct mii_ioctl_data *data = if_mii(ifr); | 1839 | struct mii_ioctl_data *data = if_mii(ifr); |
1839 | struct b44 *bp = netdev_priv(dev); | 1840 | struct b44 *bp = netdev_priv(dev); |
1840 | int err; | 1841 | int err = -EINVAL; |
1842 | |||
1843 | if (!netif_running(dev)) | ||
1844 | goto out; | ||
1841 | 1845 | ||
1842 | spin_lock_irq(&bp->lock); | 1846 | spin_lock_irq(&bp->lock); |
1843 | err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL); | 1847 | err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL); |
1844 | spin_unlock_irq(&bp->lock); | 1848 | spin_unlock_irq(&bp->lock); |
1845 | 1849 | out: | |
1846 | return err; | 1850 | return err; |
1847 | } | 1851 | } |
1848 | 1852 | ||
@@ -2113,6 +2117,7 @@ static int b44_resume(struct pci_dev *pdev) | |||
2113 | add_timer(&bp->timer); | 2117 | add_timer(&bp->timer); |
2114 | 2118 | ||
2115 | b44_enable_ints(bp); | 2119 | b44_enable_ints(bp); |
2120 | netif_wake_queue(dev); | ||
2116 | return 0; | 2121 | return 0; |
2117 | } | 2122 | } |
2118 | 2123 | ||