John,

Please apply the following patch to wireless-2.6. It addresses Michael Buesch's comments, which I seem to have missed, regarding the previous patch entitled "bcm43xx-softmac: Init, shutdown and restart fixes".

My copy of the wireless-2.6 indicates that the original patch has already been applied, thus this one only moves the call to bcm43xx_periodic_tasks_setup.

Larry

===============================

This patch fixes an out of sequence step in the bcm43xx_init_board routine for bcm43xx-softmac.

Signed-off-by: Larry Finger <[EMAIL PROTECTED]>

Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3540,13 +3540,13 @@ static int bcm43xx_init_board(struct bcm
        if (err)
                goto err_crystal_off;

-       bcm43xx_periodic_tasks_setup(bcm);
        err = bcm43xx_sysfs_register(bcm);
        if (err)
                goto err_wlshutdown;
        err = bcm43xx_rng_init(bcm);
        if (err)
                goto err_sysfs_unreg;
+       bcm43xx_periodic_tasks_setup(bcm);

        /*FIXME: This should be handled by softmac instead. */
        schedule_work(&bcm->softmac->associnfo.work);

Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3540,13 +3540,13 @@ static int bcm43xx_init_board(struct bcm
        if (err)
                goto err_crystal_off;
 
-       bcm43xx_periodic_tasks_setup(bcm);
        err = bcm43xx_sysfs_register(bcm);
        if (err)
                goto err_wlshutdown;
        err = bcm43xx_rng_init(bcm);
        if (err)
                goto err_sysfs_unreg;
+       bcm43xx_periodic_tasks_setup(bcm);
 
        /*FIXME: This should be handled by softmac instead. */
        schedule_work(&bcm->softmac->associnfo.work);

Reply via email to