diff options
author | Michael Buesch <mb@bu3sch.de> | 2006-06-28 14:35:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 18:19:14 -0400 |
commit | 3234faa8abe0c3d6da12cc4a38ce790134c92564 (patch) | |
tree | ac2ee8630c1bae65b22b0f48c61b64b121227b70 /drivers/net/wireless/bcm43xx | |
parent | b8e7cdb391c50cfc243a387b6690f5a251537e50 (diff) |
[PATCH] bcm43xx: fix mac_suspend refcount
This fixes mac_suspend reference counting for
ifconfig up
ifconfig down
ifconfig up
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index acf567c2e220..1c04722edaa0 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
@@ -3320,6 +3320,8 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm) | |||
3320 | mutex_lock(&bcm->mutex); | 3320 | mutex_lock(&bcm->mutex); |
3321 | bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING); | 3321 | bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING); |
3322 | 3322 | ||
3323 | bcm->mac_suspended = 1; | ||
3324 | |||
3323 | err = bcm43xx_pctl_set_crystal(bcm, 1); | 3325 | err = bcm43xx_pctl_set_crystal(bcm, 1); |
3324 | if (err) | 3326 | if (err) |
3325 | goto out; | 3327 | goto out; |
@@ -3832,7 +3834,6 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm, | |||
3832 | bcm->softmac->set_channel = bcm43xx_ieee80211_set_chan; | 3834 | bcm->softmac->set_channel = bcm43xx_ieee80211_set_chan; |
3833 | 3835 | ||
3834 | bcm->irq_savedstate = BCM43xx_IRQ_INITIAL; | 3836 | bcm->irq_savedstate = BCM43xx_IRQ_INITIAL; |
3835 | bcm->mac_suspended = 1; | ||
3836 | bcm->pci_dev = pci_dev; | 3837 | bcm->pci_dev = pci_dev; |
3837 | bcm->net_dev = net_dev; | 3838 | bcm->net_dev = net_dev; |
3838 | bcm->bad_frames_preempt = modparam_bad_frames_preempt; | 3839 | bcm->bad_frames_preempt = modparam_bad_frames_preempt; |