1 files changed, 52 insertions, 55 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index b45063974ae9..c35cb3a0777e 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -55,13 +55,13 @@ static int bcm43xx_wx_get_name(struct net_device *net_dev,
                                char *extra)
 {
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
         int i;
+        unsigned long flags;
         struct bcm43xx_phyinfo *phy;
         char suffix[7] = { 0 };
         int have_a = 0, have_b = 0, have_g = 0;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         for (i = 0; i < bcm->nr_80211_available; i++) {
                 phy = &(bcm->core_80211_ext[i].phy);
                 switch (phy->type) {
@@ -77,7 +77,7 @@ static int bcm43xx_wx_get_name(struct net_device *net_dev,
                         assert(0);
                 }
         }
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         i = 0;
         if (have_a) {
@@ -111,7 +111,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
         int freq;
         int err = -EINVAL;
 
-        bcm43xx_lock_mmio(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         if ((data->freq.m >= 0) && (data->freq.m <= 1000)) {
                 channel = data->freq.m;
                 freq = bcm43xx_channel_to_freq(bcm, channel);
@@ -121,7 +121,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
         }
         if (!bcm43xx_is_valid_channel(bcm, channel))
                 goto out_unlock;
-        if (bcm->initialized) {
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
                 //ieee80211softmac_disassoc(softmac, $REASON);
                 bcm43xx_mac_suspend(bcm);
                 err = bcm43xx_radio_selectchannel(bcm, channel, 0);
@@ -131,7 +131,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
                 err = 0;
         }
 out_unlock:
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -147,11 +147,10 @@ static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,
         int err = -ENODEV;
         u16 channel;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         radio = bcm43xx_current_radio(bcm);
         channel = radio->channel;
         if (channel == 0xFF) {
-                assert(!bcm->initialized);
                 channel = radio->initial_channel;
                 if (channel == 0xFF)
                         goto out_unlock;
@@ -163,7 +162,7 @@ static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,
 
         err = 0;
 out_unlock:
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -181,13 +180,13 @@ static int bcm43xx_wx_set_mode(struct net_device *net_dev,
         if (mode == IW_MODE_AUTO)
                 mode = BCM43xx_INITIAL_IWMODE;
 
-        bcm43xx_lock_mmio(bcm, flags);
-        if (bcm->initialized) {
+        bcm43xx_lock_irqsafe(bcm, flags);
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
                 if (bcm->ieee->iw_mode != mode)
                         bcm43xx_set_iwmode(bcm, mode);
         } else
                 bcm->ieee->iw_mode = mode;
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -200,9 +199,9 @@ static int bcm43xx_wx_get_mode(struct net_device *net_dev,
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
         unsigned long flags;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         data->mode = bcm->ieee->iw_mode;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -255,7 +254,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
                           IW_ENC_CAPA_CIPHER_TKIP |
                           IW_ENC_CAPA_CIPHER_CCMP;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         phy = bcm43xx_current_phy(bcm);
 
         range->num_bitrates = 0;
@@ -302,7 +301,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
         }
         range->num_frequency = j;
 
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -313,14 +312,13 @@ static int bcm43xx_wx_set_nick(struct net_device *net_dev,
                                char *extra)
 {
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
         size_t len;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_noirq(bcm);
         len =  min((size_t)data->data.length, (size_t)IW_ESSID_MAX_SIZE);
         memcpy(bcm->nick, extra, len);
         bcm->nick[len] = '\0';
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_noirq(bcm);
 
         return 0;
 }
@@ -331,15 +329,14 @@ static int bcm43xx_wx_get_nick(struct net_device *net_dev,
                                char *extra)
 {
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        unsigned long flags;
         size_t len;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_noirq(bcm);
         len = strlen(bcm->nick) + 1;
         memcpy(extra, bcm->nick, len);
         data->data.length = (__u16)len;
         data->data.flags = 1;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_noirq(bcm);
 
         return 0;
 }
@@ -353,7 +350,7 @@ static int bcm43xx_wx_set_rts(struct net_device *net_dev,
         unsigned long flags;
         int err = -EINVAL;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         if (data->rts.disabled) {
                 bcm->rts_threshold = BCM43xx_MAX_RTS_THRESHOLD;
                 err = 0;
@@ -364,7 +361,7 @@ static int bcm43xx_wx_set_rts(struct net_device *net_dev,
                         err = 0;
                 }
         }
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -377,11 +374,11 @@ static int bcm43xx_wx_get_rts(struct net_device *net_dev,
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
         unsigned long flags;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         data->rts.value = bcm->rts_threshold;
         data->rts.fixed = 0;
         data->rts.disabled = (bcm->rts_threshold == BCM43xx_MAX_RTS_THRESHOLD);
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -395,7 +392,7 @@ static int bcm43xx_wx_set_frag(struct net_device *net_dev,
         unsigned long flags;
         int err = -EINVAL;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         if (data->frag.disabled) {
                 bcm->ieee->fts = MAX_FRAG_THRESHOLD;
                 err = 0;
@@ -406,7 +403,7 @@ static int bcm43xx_wx_set_frag(struct net_device *net_dev,
                         err = 0;
                 }
         }
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -419,11 +416,11 @@ static int bcm43xx_wx_get_frag(struct net_device *net_dev,
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
         unsigned long flags;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         data->frag.value = bcm->ieee->fts;
         data->frag.fixed = 0;
         data->frag.disabled = (bcm->ieee->fts == MAX_FRAG_THRESHOLD);
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -445,8 +442,8 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
                 return -EOPNOTSUPP;
         }
 
-        bcm43xx_lock_mmio(bcm, flags);
-        if (!bcm->initialized)
+        bcm43xx_lock_irqsafe(bcm, flags);
+        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)
                 goto out_unlock;
         radio = bcm43xx_current_radio(bcm);
         phy = bcm43xx_current_phy(bcm);
@@ -469,7 +466,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
         err = 0;
 
 out_unlock:
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -484,8 +481,8 @@ static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,
         unsigned long flags;
         int err = -ENODEV;
 
-        bcm43xx_lock(bcm, flags);
-        if (!bcm->initialized)
+        bcm43xx_lock_irqsafe(bcm, flags);
+        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)
                 goto out_unlock;
         radio = bcm43xx_current_radio(bcm);
         /* desired dBm value is in Q5.2 */
@@ -496,7 +493,7 @@ static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,
 
         err = 0;
 out_unlock:
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -583,8 +580,8 @@ static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
                 return -EINVAL;
         }
 
-        bcm43xx_lock_mmio(bcm, flags);
-        if (bcm->initialized) {
+        bcm43xx_lock_irqsafe(bcm, flags);
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
                 err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
                 if (err) {
                         printk(KERN_ERR PFX "Interference Mitigation not "
@@ -598,7 +595,7 @@ static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
                 } else
                         bcm43xx_current_radio(bcm)->interfmode = mode;
         }
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return err;
 }
@@ -612,9 +609,9 @@ static int bcm43xx_wx_get_interfmode(struct net_device *net_dev,
         unsigned long flags;
         int mode;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         mode = bcm43xx_current_radio(bcm)->interfmode;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         switch (mode) {
         case BCM43xx_RADIO_INTERFMODE_NONE:
@@ -644,9 +641,9 @@ static int bcm43xx_wx_set_shortpreamble(struct net_device *net_dev,
         int on;
 
         on = *((int *)extra);
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         bcm->short_preamble = !!on;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -660,9 +657,9 @@ static int bcm43xx_wx_get_shortpreamble(struct net_device *net_dev,
         unsigned long flags;
         int on;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         on = bcm->short_preamble;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         if (on)
                 strncpy(extra, "1 (Short Preamble enabled)", MAX_WX_STRING);
@@ -684,11 +681,11 @@ static int bcm43xx_wx_set_swencryption(struct net_device *net_dev,
         
         on = *((int *)extra);
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         bcm->ieee->host_encrypt = !!on;
         bcm->ieee->host_decrypt = !!on;
         bcm->ieee->host_build_iv = !on;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         return 0;
 }
@@ -702,9 +699,9 @@ static int bcm43xx_wx_get_swencryption(struct net_device *net_dev,
         unsigned long flags;
         int on;
 
-        bcm43xx_lock(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         on = bcm->ieee->host_encrypt;
-        bcm43xx_unlock(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 
         if (on)
                 strncpy(extra, "1 (SW encryption enabled) ", MAX_WX_STRING);
@@ -767,11 +764,11 @@ static int bcm43xx_wx_sprom_read(struct net_device *net_dev,
         if (!sprom)
                 goto out;
 
-        bcm43xx_lock_mmio(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         err = -ENODEV;
-        if (bcm->initialized)
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)
                 err = bcm43xx_sprom_read(bcm, sprom);
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
         if (!err)
                 data->data.length = sprom2hex(sprom, extra);
         kfree(sprom);
@@ -812,11 +809,11 @@ static int bcm43xx_wx_sprom_write(struct net_device *net_dev,
         if (err)
                 goto out_kfree;
 
-        bcm43xx_lock_mmio(bcm, flags);
+        bcm43xx_lock_irqsafe(bcm, flags);
         err = -ENODEV;
-        if (bcm->initialized)
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)
                 err = bcm43xx_sprom_write(bcm, sprom);
-        bcm43xx_unlock_mmio(bcm, flags);
+        bcm43xx_unlock_irqsafe(bcm, flags);
 out_kfree:
         kfree(sprom);
 out: