From e8db619c11189db7ae65d299425367b6d1abe08e Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Mon, 1 May 2006 22:43:00 +0200
Subject: [PATCH] --- yaml --- r: 26585 b: refs/heads/master c:
 5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e h: refs/heads/master i:   26583:
 d768eeabeb6cfccf43797614afb0686be6a1d318 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b6affcd59c96..c6adc2f7cef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00
+refs/heads/master: 5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index 3edbb481a0a0..b45063974ae9 100644
--- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/trunk/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;