Skip to content

Commit bc519f3

Browse files
dwmw2linvjw
authored andcommitted
[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 <[email protected]> Signed-off-by: John W. Linville <[email protected]>
1 parent 0c056c5 commit bc519f3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/wireless/bcm43xx/bcm43xx_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3271,6 +3271,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
32713271
bcm43xx_sysfs_register(bcm);
32723272
//FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though...
32733273

3274+
/*FIXME: This should be handled by softmac instead. */
3275+
schedule_work(&bcm->softmac->associnfo.work);
3276+
32743277
assert(err == 0);
32753278
out:
32763279
return err;
@@ -3946,9 +3949,6 @@ static int bcm43xx_resume(struct pci_dev *pdev)
39463949

39473950
netif_device_attach(net_dev);
39483951

3949-
/*FIXME: This should be handled by softmac instead. */
3950-
schedule_work(&bcm->softmac->associnfo.work);
3951-
39523952
dprintk(KERN_INFO PFX "Device resumed.\n");
39533953

39543954
return 0;

0 commit comments

Comments
 (0)