diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-05 17:38:27 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:53:19 -0400 |
| commit | bc519f30eb039f023c15167663d5a8a14fed7dcb (patch) | |
| tree | af9e2500cda4b1674f58db5c78132327e1210d6c /drivers/net/wireless/bcm43xx | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
| download | blackbird-op-linux-bc519f30eb039f023c15167663d5a8a14fed7dcb.tar.gz blackbird-op-linux-bc519f30eb039f023c15167663d5a8a14fed7dcb.zip | |
[PATCH] bcm43xx: associate on 'ifconfig up'
I still need this hack to work around the fact that softmac doesn't
attempt to associate when we bring the device up...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index e2982a83ae42..7ed18cad29f7 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -3271,6 +3271,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm) bcm43xx_sysfs_register(bcm); //FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though... + /*FIXME: This should be handled by softmac instead. */ + schedule_work(&bcm->softmac->associnfo.work); + assert(err == 0); out: return err; @@ -3946,9 +3949,6 @@ static int bcm43xx_resume(struct pci_dev *pdev) netif_device_attach(net_dev); - /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); - dprintk(KERN_INFO PFX "Device resumed.\n"); return 0; |
