[PATCH] bcm43xx: fix iwmode crash when down

This fixes a crash when

	iwconfig ethX mode foo

is done before

	ifconfig ethX up

or after

	ifconfig ethX down

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index 3edbb481a0a035ebd957decbe43a76cad3c294e6..b45063974ae9dd196b93bb7a310bf2c62c7b5f3a 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -182,8 +182,11 @@ static int bcm43xx_wx_set_mode(struct net_device *net_dev,
                mode = BCM43xx_INITIAL_IWMODE;
 
        bcm43xx_lock_mmio(bcm, flags);
-       if (bcm->ieee->iw_mode != mode)
-               bcm43xx_set_iwmode(bcm, mode);
+       if (bcm->initialized) {
+               if (bcm->ieee->iw_mode != mode)
+                       bcm43xx_set_iwmode(bcm, mode);
+       } else
+               bcm->ieee->iw_mode = mode;
        bcm43xx_unlock_mmio(bcm, flags);
 
        return 0;