Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

25 files changed, 149 insertions, 222 deletions

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index fb5e43bd7c3c..bc13533a5418 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -523,7 +523,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
                 mac->opmode == NL80211_IFTYPE_ADHOC)
                 bw_40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40;
 
-        if ((bw_40 == true) && sgi_40)
+        if (bw_40 && sgi_40)
                 tcb_desc->use_shortgi = true;
         else if ((bw_40 == false) && sgi_20)
                 tcb_desc->use_shortgi = true;
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index d2ec2535aa3c..03ce69660b26 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -335,8 +335,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                  * before going offchannel, or dis-association or delete BA will
                  * happen by AP
                  */
-                if (rtlpriv->mac80211.offchan_deley) {
-                        rtlpriv->mac80211.offchan_deley = false;
+                if (rtlpriv->mac80211.offchan_delay) {
+                        rtlpriv->mac80211.offchan_delay = false;
                         mdelay(50);
                 }
                 rtlphy->current_channel = wide_chan;
@@ -443,11 +443,11 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
                         sta_entry->wireless_mode = WIRELESS_MODE_G;
                         if (sta->supp_rates[0] <= 0xf)
                                 sta_entry->wireless_mode = WIRELESS_MODE_B;
-                        if (sta->ht_cap.ht_supported == true)
+                        if (sta->ht_cap.ht_supported)
                                 sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
                 } else if (rtlhal->current_bandtype == BAND_ON_5G) {
                         sta_entry->wireless_mode = WIRELESS_MODE_A;
-                        if (sta->ht_cap.ht_supported == true)
+                        if (sta->ht_cap.ht_supported)
                                 sta_entry->wireless_mode = WIRELESS_MODE_N_24G;
                 }
 
@@ -650,7 +650,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          ("BSS_CHANGED_HT\n"));
                 rcu_read_lock();
-                sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);
+                sta = get_sta(hw, vif, bss_conf->bssid);
                 if (sta) {
                         if (sta->ht_cap.ampdu_density >
                             mac->current_ampdu_density)
@@ -685,7 +685,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->set_network_type(hw, vif->type);
 
                 rcu_read_lock();
-                sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);
+                sta = get_sta(hw, vif, bss_conf->bssid);
                 if (!sta) {
                         rcu_read_unlock();
                         goto out;
diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index 4b247db2861d..f02824a3b747 100644
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -30,6 +30,8 @@
 #ifndef __RTL_CORE_H__
 #define __RTL_CORE_H__
 
+#include <net/mac80211.h>
+
 #define RTL_SUPPORTED_FILTERS           \
         (FIF_PROMISC_IN_BSS | \
         FIF_ALLMULTI | FIF_CONTROL | \
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 0b562322f138..3fc21f60bb04 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -382,7 +382,7 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
                         }
                 }
 
-                if (wordchanged == true)
+                if (wordchanged)
                         hdr_num++;
         }
 
@@ -453,7 +453,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                 base = offset * 8;
 
                 for (i = 0; i < 8; i++) {
-                        if (first_pg == true) {
+                        if (first_pg) {
 
                                 word_en &= ~(BIT(i / 2));
 
@@ -505,7 +505,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 
-        if (rtlefuse->autoload_failflag == true)
+        if (rtlefuse->autoload_failflag)
                 memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF,
                         rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
         else
@@ -690,7 +690,7 @@ static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                         }
                 }
 
-                if (dataempty == true) {
+                if (dataempty) {
                         *readstate = PG_STATE_DATA;
                 } else {
                         *efuse_addr = *efuse_addr + (word_cnts * 2) + 1;
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index e502db0532e5..ad39af462f87 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -581,7 +581,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                 fc = rtl_get_fc(skb);
                 if (ieee80211_is_nullfunc(fc)) {
                         if (ieee80211_has_pm(fc)) {
-                                rtlpriv->mac80211.offchan_deley = true;
+                                rtlpriv->mac80211.offchan_delay = true;
                                 rtlpriv->psc.state_inap = 1;
                         } else {
                                 rtlpriv->psc.state_inap = 0;
@@ -626,6 +626,56 @@ tx_status_ok:
         }
 }
 
+static void _rtl_receive_one(struct ieee80211_hw *hw, struct sk_buff *skb,
+                             struct ieee80211_rx_status rx_status)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
+        __le16 fc = rtl_get_fc(skb);
+        bool unicast = false;
+        struct sk_buff *uskb = NULL;
+        u8 *pdata;
+
+
+        memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
+
+        if (is_broadcast_ether_addr(hdr->addr1)) {
+                ;/*TODO*/
+        } else if (is_multicast_ether_addr(hdr->addr1)) {
+                ;/*TODO*/
+        } else {
+                unicast = true;
+                rtlpriv->stats.rxbytesunicast += skb->len;
+        }
+
+        rtl_is_special_data(hw, skb, false);
+
+        if (ieee80211_is_data(fc)) {
+                rtlpriv->cfg->ops->led_control(hw, LED_CTL_RX);
+
+                if (unicast)
+                        rtlpriv->link_info.num_rx_inperiod++;
+        }
+
+        /* for sw lps */
+        rtl_swlps_beacon(hw, (void *)skb->data, skb->len);
+        rtl_recognize_peer(hw, (void *)skb->data, skb->len);
+        if ((rtlpriv->mac80211.opmode == NL80211_IFTYPE_AP) &&
+            (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) &&
+             (ieee80211_is_beacon(fc) || ieee80211_is_probe_resp(fc)))
+                return;
+
+        if (unlikely(!rtl_action_proc(hw, skb, false)))
+                return;
+
+        uskb = dev_alloc_skb(skb->len + 128);
+        memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status, sizeof(rx_status));
+        pdata = (u8 *)skb_put(uskb, skb->len);
+        memcpy(pdata, skb->data, skb->len);
+
+        ieee80211_rx_irqsafe(hw, uskb);
+}
+
 static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -637,7 +687,6 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
         u8 own;
         u8 tmp_one;
         u32 bufferaddress;
-        bool unicast = false;
 
         struct rtl_stats stats = {
                 .signal = 0,
@@ -654,128 +703,63 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 /*rx pkt */
                 struct sk_buff *skb = rtlpci->rx_ring[rx_queue_idx].rx_buf[
                                 index];
+                struct sk_buff *new_skb = NULL;
 
                 own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
                                                        false, HW_DESC_OWN);
 
-                if (own) {
-                        /*wait data to be filled by hardware */
+                /*wait data to be filled by hardware */
+                if (own)
                         break;
-                } else {
-                        struct ieee80211_hdr *hdr;
-                        __le16 fc;
-                        struct sk_buff *new_skb = NULL;
-
-                        rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
-                                                         &rx_status,
-                                                         (u8 *) pdesc, skb);
-
-                        new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
-                        if (unlikely(!new_skb)) {
-                                RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
-                                         DBG_DMESG,
-                                         ("can't alloc skb for rx\n"));
-                                goto done;
-                        }
 
-                        pci_unmap_single(rtlpci->pdev,
-                                         *((dma_addr_t *) skb->cb),
-                                         rtlpci->rxbuffersize,
-                                         PCI_DMA_FROMDEVICE);
+                rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
+                                                 &rx_status,
+                                                 (u8 *) pdesc, skb);
 
-                        skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc,
-                                                         false,
-                                                         HW_DESC_RXPKT_LEN));
-                        skb_reserve(skb,
-                                    stats.rx_drvinfo_size + stats.rx_bufshift);
+                if (stats.crc || stats.hwerror)
+                        goto done;
 
-                        /*
-                         *NOTICE This can not be use for mac80211,
-                         *this is done in mac80211 code,
-                         *if you done here sec DHCP will fail
-                         *skb_trim(skb, skb->len - 4);
-                         */
+                new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
+                if (unlikely(!new_skb)) {
+                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
+                                 DBG_DMESG,
+                                 ("can't alloc skb for rx\n"));
+                        goto done;
+                }
 
-                        hdr = rtl_get_hdr(skb);
-                        fc = rtl_get_fc(skb);
-
-                        if (!stats.crc && !stats.hwerror) {
-                                memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
-                                       sizeof(rx_status));
-
-                                if (is_broadcast_ether_addr(hdr->addr1)) {
-                                        ;/*TODO*/
-                                } else if (is_multicast_ether_addr(hdr->addr1)) {
-                                        ;/*TODO*/
-                                } else {
-                                        unicast = true;
-                                        rtlpriv->stats.rxbytesunicast +=
-                                            skb->len;
-                                }
-
-                                rtl_is_special_data(hw, skb, false);
-
-                                if (ieee80211_is_data(fc)) {
-                                        rtlpriv->cfg->ops->led_control(hw,
-                                                               LED_CTL_RX);
-
-                                        if (unicast)
-                                                rtlpriv->link_info.
-                                                    num_rx_inperiod++;
-                                }
-
-                                /* for sw lps */
-                                rtl_swlps_beacon(hw, (void *)skb->data,
-                                                 skb->len);
-                                rtl_recognize_peer(hw, (void *)skb->data,
-                                                   skb->len);
-                                if ((rtlpriv->mac80211.opmode ==
-                                     NL80211_IFTYPE_AP) &&
-                                    (rtlpriv->rtlhal.current_bandtype ==
-                                     BAND_ON_2_4G) &&
-                                     (ieee80211_is_beacon(fc) ||
-                                     ieee80211_is_probe_resp(fc))) {
-                                        dev_kfree_skb_any(skb);
-                                } else {
-                                        if (unlikely(!rtl_action_proc(hw, skb,
-                                            false))) {
-                                                dev_kfree_skb_any(skb);
-                                        } else {
-                                                struct sk_buff *uskb = NULL;
-                                                u8 *pdata;
-                                                uskb = dev_alloc_skb(skb->len
-                                                                     + 128);
-                                                memcpy(IEEE80211_SKB_RXCB(uskb),
-                                                       &rx_status,
-                                                       sizeof(rx_status));
-                                                pdata = (u8 *)skb_put(uskb,
-                                                        skb->len);
-                                                memcpy(pdata, skb->data,
-                                                       skb->len);
-                                                dev_kfree_skb_any(skb);
-
-                                                ieee80211_rx_irqsafe(hw, uskb);
-                                        }
-                                }
-                        } else {
-                                dev_kfree_skb_any(skb);
-                        }
+                pci_unmap_single(rtlpci->pdev,
+                                 *((dma_addr_t *) skb->cb),
+                                 rtlpci->rxbuffersize,
+                                 PCI_DMA_FROMDEVICE);
 
-                        if (((rtlpriv->link_info.num_rx_inperiod +
-                                rtlpriv->link_info.num_tx_inperiod) > 8) ||
-                                (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                                tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
-                        }
+                skb_put(skb, rtlpriv->cfg->ops->get_desc((u8 *) pdesc, false,
+                        HW_DESC_RXPKT_LEN));
+                skb_reserve(skb, stats.rx_drvinfo_size + stats.rx_bufshift);
 
-                        skb = new_skb;
+                /*
+                 * NOTICE This can not be use for mac80211,
+                 * this is done in mac80211 code,
+                 * if you done here sec DHCP will fail
+                 * skb_trim(skb, skb->len - 4);
+                 */
 
-                        rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
-                        *((dma_addr_t *) skb->cb) =
+                _rtl_receive_one(hw, skb, rx_status);
+
+                if (((rtlpriv->link_info.num_rx_inperiod +
+                        rtlpriv->link_info.num_tx_inperiod) > 8) ||
+                        (rtlpriv->link_info.num_rx_inperiod > 2)) {
+                        tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+                }
+
+                dev_kfree_skb_any(skb);
+                skb = new_skb;
+
+                rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
+                *((dma_addr_t *) skb->cb) =
                             pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
                                            rtlpci->rxbuffersize,
                                            PCI_DMA_FROMDEVICE);
 
-                }
 done:
                 bufferaddress = (*((dma_addr_t *)skb->cb));
                 tmp_one = 1;
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index d14c13d02177..a693feffbe72 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -79,59 +79,18 @@ EXPORT_SYMBOL(rtl_ps_disable_nic);
 
 bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
                          enum rf_pwrstate state_toset,
-                         u32 changesource, bool protect_or_not)
+                         u32 changesource)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         bool actionallowed = false;
-        u16 rfwait_cnt = 0;
 
-        /*protect_or_not = true; */
-
-        if (protect_or_not)
-                goto no_protect;
-
-        /*
-         *Only one thread can change
-         *the RF state at one time, and others
-         *should wait to be executed.
-         */
-        while (true) {
-                spin_lock(&rtlpriv->locks.rf_ps_lock);
-                if (ppsc->rfchange_inprogress) {
-                        spin_unlock(&rtlpriv->locks.rf_ps_lock);
-
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 ("RF Change in progress!"
-                                  "Wait to set..state_toset(%d).\n",
-                                  state_toset));
-
-                        /* Set RF after the previous action is done.  */
-                        while (ppsc->rfchange_inprogress) {
-                                rfwait_cnt++;
-                                mdelay(1);
-
-                                /*
-                                 *Wait too long, return false to avoid
-                                 *to be stuck here.
-                                 */
-                                if (rfwait_cnt > 100)
-                                        return false;
-                        }
-                } else {
-                        ppsc->rfchange_inprogress = true;
-                        spin_unlock(&rtlpriv->locks.rf_ps_lock);
-                        break;
-                }
-        }
-
-no_protect:
         switch (state_toset) {
         case ERFON:
                 ppsc->rfoff_reason &= (~changesource);
 
                 if ((changesource == RF_CHANGE_BY_HW) &&
-                    (ppsc->hwradiooff == true)) {
+                    (ppsc->hwradiooff)) {
                         ppsc->hwradiooff = false;
                 }
 
@@ -167,12 +126,6 @@ no_protect:
         if (actionallowed)
                 rtlpriv->cfg->ops->set_rf_power_state(hw, state_toset);
 
-        if (!protect_or_not) {
-                spin_lock(&rtlpriv->locks.rf_ps_lock);
-                ppsc->rfchange_inprogress = false;
-                spin_unlock(&rtlpriv->locks.rf_ps_lock);
-        }
-
         return actionallowed;
 }
 EXPORT_SYMBOL(rtl_ps_set_rf_state);
@@ -195,8 +148,7 @@ static void _rtl_ps_inactive_ps(struct ieee80211_hw *hw)
                 }
         }
 
-        rtl_ps_set_rf_state(hw, ppsc->inactive_pwrstate,
-                            RF_CHANGE_BY_IPS, false);
+        rtl_ps_set_rf_state(hw, ppsc->inactive_pwrstate, RF_CHANGE_BY_IPS);
 
         if (ppsc->inactive_pwrstate == ERFOFF &&
             rtlhal->interface == INTF_PCI) {
@@ -587,7 +539,7 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
         }
 
         spin_lock(&rtlpriv->locks.lps_lock);
-        rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS, false);
+        rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);
         spin_unlock(&rtlpriv->locks.lps_lock);
 }
 
@@ -621,15 +573,8 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
         if (rtlpriv->link_info.busytraffic)
                 return;
 
-        spin_lock(&rtlpriv->locks.rf_ps_lock);
-        if (rtlpriv->psc.rfchange_inprogress) {
-                spin_unlock(&rtlpriv->locks.rf_ps_lock);
-                return;
-        }
-        spin_unlock(&rtlpriv->locks.rf_ps_lock);
-
         spin_lock(&rtlpriv->locks.lps_lock);
-        rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS, false);
+        rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);
         spin_unlock(&rtlpriv->locks.lps_lock);
 
         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&
diff --git a/drivers/net/wireless/rtlwifi/ps.h b/drivers/net/wireless/rtlwifi/ps.h
index e3bf89840370..84628e6041c7 100644
--- a/drivers/net/wireless/rtlwifi/ps.h
+++ b/drivers/net/wireless/rtlwifi/ps.h
@@ -33,8 +33,7 @@
 #define MAX_SW_LPS_SLEEP_INTV   5
 
 bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
-                         enum rf_pwrstate state_toset, u32 changesource,
-                         bool protect_or_not);
+                         enum rf_pwrstate state_toset, u32 changesource);
 bool rtl_ps_enable_nic(struct ieee80211_hw *hw);
 bool rtl_ps_disable_nic(struct ieee80211_hw *hw);
 void rtl_ips_nic_off(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index 30da68a77786..539df66dce0a 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -200,7 +200,7 @@ static void rtl_tx_status(void *ppriv,
         if (sta) {
                 /* Check if aggregation has to be enabled for this tid */
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
-                if ((sta->ht_cap.ht_supported == true) &&
+                if ((sta->ht_cap.ht_supported) &&
                                 !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
                         if (ieee80211_is_data_qos(fc)) {
                                 u8 tid = rtl_get_tid(skb);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 97183829b9be..a00774e7090d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -474,7 +474,7 @@ static void rtl92c_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
 {
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        if (mac->act_scanning == true)
+        if (mac->act_scanning)
                 return;
 
         if (mac->link_state >= MAC80211_LINKED)
@@ -670,7 +670,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         u8 ofdm_index[2], cck_index = 0, ofdm_index_old[2], cck_index_old = 0;
         int i;
         bool is2t = IS_92C_SERIAL(rtlhal->version);
-        u8 txpwr_level[2] = {0, 0};
+        s8 txpwr_level[2] = {0, 0};
         u8 ofdm_min_index = 6, rf;
 
         rtlpriv->dm.txpower_trackinginit = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 944f55e9d316..bc6ae9dcf940 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -488,7 +488,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_CORRECT_TSF:{
                         u8 btype_ibss = ((u8 *) (val))[0];
 
-                        if (btype_ibss == true)
+                        if (btype_ibss)
                                 _rtl92ce_stop_tx_beacon(hw);
 
                         _rtl92ce_set_bcn_ctrl_reg(hw, 0, BIT(3));
@@ -500,7 +500,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         _rtl92ce_set_bcn_ctrl_reg(hw, BIT(3), 0);
 
-                        if (btype_ibss == true)
+                        if (btype_ibss)
                                 _rtl92ce_resume_tx_beacon(hw);
 
                         break;
@@ -1121,7 +1121,7 @@ void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
         if (rtlpriv->psc.rfpwr_state != ERFON)
                 return;
 
-        if (check_bssid == true) {
+        if (check_bssid) {
                 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
                                               (u8 *) (&reg_rcr));
@@ -1585,7 +1585,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                 rtlefuse->autoload_failflag = false;
         }
 
-        if (rtlefuse->autoload_failflag == true)
+        if (rtlefuse->autoload_failflag)
                 return;
 
         for (i = 0; i < 6; i += 2) {
@@ -1994,7 +1994,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         u1tmp = rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL);
         e_rfpowerstate_toset = (u1tmp & BIT(3)) ? ERFON : ERFOFF;
 
-        if ((ppsc->hwradiooff == true) && (e_rfpowerstate_toset == ERFON)) {
+        if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          ("GPIOChangeRF  - HW Radio ON, RF ON\n"));
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
index 9dd1ed7b6422..28a1a707d09c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
@@ -84,7 +84,7 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         case LED_PIN_LED0:
                 ledcfg &= 0xf0;
-                if (pcipriv->ledctl.led_opendrain == true)
+                if (pcipriv->ledctl.led_opendrain)
                         rtl_write_byte(rtlpriv, REG_LEDCFG2,
                                        (ledcfg | BIT(1) | BIT(5) | BIT(6)));
                 else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index 90d0f2cf3b27..d3b01e6023ba 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
@@ -76,7 +76,7 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         if (rtlefuse->eeprom_regulatory != 0)
                 turbo_scanoff = true;
 
-        if (mac->act_scanning == true) {
+        if (mac->act_scanning) {
                 tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
                 tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 2492cc234c03..230bbe900d8d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -225,7 +225,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct phy_sts_cck_8192s_t *cck_buf;
-        s8 rx_pwr_all, rx_pwr[4];
+        s8 rx_pwr_all = 0, rx_pwr[4];
         u8 evm, pwdb_all, rf_rx_num = 0;
         u8 i, max_spatial_stream;
         u32 rssi, total_rssi = 0;
@@ -678,7 +678,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
                                                     GET_RX_DESC_PAGGR(pdesc));
 
         rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
-        if (phystatus == true) {
+        if (phystatus) {
                 p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
                                                      stats->rx_bufshift);
 
@@ -927,7 +927,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
 
 void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
 {
-        if (istx == true) {
+        if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
                         wmb();
@@ -968,7 +968,7 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
 {
         u32 ret = 0;
 
-        if (istx == true) {
+        if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
                         ret = GET_TX_DESC_OWN(p_desc);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 52e2af58c1ed..2b34764fbf73 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -520,7 +520,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
                 rtlefuse->autoload_failflag = false;
         }
-        if (rtlefuse->autoload_failflag == true)
+        if (rtlefuse->autoload_failflag)
                 return;
         for (i = 0; i < 6; i += 2) {
                 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
@@ -1594,7 +1594,7 @@ static void _rtl92cu_set_check_bssid(struct ieee80211_hw *hw,
         default:
                 break;
         }
-        if (filterout_non_associated_bssid == true) {
+        if (filterout_non_associated_bssid) {
                 if (IS_NORMAL_CHIP(rtlhal->version)) {
                         switch (rtlphy->current_io_type) {
                         case IO_CMD_RESUME_DM_BY_SCAN:
@@ -2155,7 +2155,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_CORRECT_TSF:{
                         u8 btype_ibss = ((u8 *) (val))[0];
 
-                        if (btype_ibss == true)
+                        if (btype_ibss)
                                 _rtl92cu_stop_tx_beacon(hw);
                         _rtl92cu_set_bcn_ctrl_reg(hw, 0, BIT(3));
                         rtl_write_dword(rtlpriv, REG_TSFTR, (u32)(mac->tsf &
@@ -2163,7 +2163,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_dword(rtlpriv, REG_TSFTR + 4,
                                         (u32)((mac->tsf >> 32) & 0xffffffff));
                         _rtl92cu_set_bcn_ctrl_reg(hw, BIT(3), 0);
-                        if (btype_ibss == true)
+                        if (btype_ibss)
                                 _rtl92cu_resume_tx_beacon(hw);
                         break;
                 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
index 332c74348a69..2ff9d8314e7b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
@@ -82,7 +82,7 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         case LED_PIN_LED0:
                 ledcfg &= 0xf0;
-                if (usbpriv->ledctl.led_opendrain == true)
+                if (usbpriv->ledctl.led_opendrain)
                         rtl_write_byte(rtlpriv, REG_LEDCFG2,
                                        (ledcfg | BIT(1) | BIT(5) | BIT(6)));
                 else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index c7576ec4744e..1e851aae58db 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -82,7 +82,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
                     (rtlefuse->external_pa))
                         turbo_scanoff = true;
         }
-        if (mac->act_scanning == true) {
+        if (mac->act_scanning) {
                 tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
                 tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
                 if (turbo_scanoff) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 3a92ba3c4a1e..906e7aa55bc3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -342,7 +342,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
                                                 (u8)GET_RX_DESC_RX_MCS(pdesc),
                                                 (bool)GET_RX_DESC_PAGGR(pdesc));
         rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
-        if (phystatus == true) {
+        if (phystatus) {
                 p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE);
                 rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,
                                                  p_drvinfo);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 609c7ec7e66a..4203a8531ca0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -452,7 +452,7 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
                         if (rtlpriv->psc.rfpwr_state != ERFON)
                                 return;
 
-                        if (digtable.backoff_enable_flag == true)
+                        if (digtable.backoff_enable_flag)
                                 rtl92s_backoff_enable_flag(hw);
                         else
                                 digtable.backoff_val = DM_DIG_BACKOFF;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 35dd12d0dcf3..13da7b3c0202 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -516,7 +516,7 @@ static u8 _rtl92se_rf_onoff_detect(struct ieee80211_hw *hw)
         mdelay(10);
 
         /* check GPIO3 */
-        u1tmp = rtl_read_byte(rtlpriv, GPIO_IN);
+        u1tmp = rtl_read_byte(rtlpriv, GPIO_IN_SE);
         retval = (u1tmp & HAL_8192S_HW_GPIO_OFF_BIT) ? ERFON : ERFOFF;
 
         return retval;
@@ -994,7 +994,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
                 rtlpriv->psc.rfoff_reason = RF_CHANGE_BY_INIT;
                 rtlpriv->psc.rfpwr_state = ERFON;
-                rtl_ps_set_rf_state(hw, ERFOFF, rfoffreason, true);
+                /* FIXME: check spinlocks if this block is uncommented */
+                rtl_ps_set_rf_state(hw, ERFOFF, rfoffreason);
         } else {
                 /* gpio radio on/off is out of adapter start */
                 if (rtlpriv->psc.hwradiooff == false) {
@@ -1105,7 +1106,7 @@ void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
         if (rtlpriv->psc.rfpwr_state != ERFON)
                 return;
 
-        if (check_bssid == true) {
+        if (check_bssid) {
                 reg_rcr |= (RCR_CBSSID);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
         } else if (check_bssid == false) {
@@ -1651,7 +1652,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 rtlefuse->autoload_failflag = false;
         }
 
-        if (rtlefuse->autoload_failflag == true)
+        if (rtlefuse->autoload_failflag)
                 return;
 
         _rtl8192se_get_IC_Inferiority(hw);
@@ -2301,7 +2302,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         rfpwr_toset = _rtl92se_rf_onoff_detect(hw);
 
-        if ((ppsc->hwradiooff == true) && (rfpwr_toset == ERFON)) {
+        if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                          ("RFKILL-HW Radio ON, RF ON\n"));
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/led.c b/drivers/net/wireless/rtlwifi/rtl8192se/led.c
index 6d4f66616680..e3fe7c90ebf4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/led.c
@@ -90,7 +90,7 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         case LED_PIN_LED0:
                 ledcfg &= 0xf0;
-                if (pcipriv->ledctl.led_opendrain == true)
+                if (pcipriv->ledctl.led_opendrain)
                         rtl_write_byte(rtlpriv, LEDCFG, (ledcfg | BIT(1)));
                 else
                         rtl_write_byte(rtlpriv, LEDCFG, (ledcfg | BIT(3)));
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 7ee2daccd7d5..81a5aa4370cf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1416,7 +1416,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         case FW_CMD_HIGH_PWR_ENABLE:
                 if ((rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) ||
-                        (rtlpriv->dm.dynamic_txpower_enable == true))
+                        rtlpriv->dm.dynamic_txpower_enable)
                         break;
 
                 /* CCA threshold */
@@ -1608,7 +1608,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                 fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
 
                         if ((rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) ||
-                            (rtlpriv->dm.dynamic_txpower_enable == true))
+                            rtlpriv->dm.dynamic_txpower_enable)
                                 fw_cmdmap &= ~FW_HIGH_PWR_ENABLE_CTL;
 
                         if ((digtable.dig_ext_port_stage ==
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index 0116eaddbfac..ea32ef2d4098 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -248,12 +248,8 @@
 #define PSTIME                                  0x02E0
 #define TIMER0                                  0x02E4
 #define TIMER1                                  0x02E8
-#define GPIO_CTRL                               0x02EC
-#define GPIO_IN                                 0x02EC
-#define GPIO_OUT                                0x02ED
+#define GPIO_IN_SE                              0x02EC
 #define GPIO_IO_SEL                             0x02EE
-#define GPIO_MOD                                0x02EF
-#define GPIO_INTCTRL                            0x02F0
 #define MAC_PINMUX_CFG                          0x02F1
 #define LEDCFG                                  0x02F2
 #define PHY_REG                                 0x02F3
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
index 1d3a48330399..c6e3a4ca42f9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
@@ -410,7 +410,7 @@ void rtl92s_phy_rf6052_set_ccktxpower(struct ieee80211_hw *hw, u8 pwrlevel)
               (rtlefuse->eeprom_regulatory != 0)))
                 dont_inc_cck_or_turboscanoff = true;
 
-        if (mac->act_scanning == true) {
+        if (mac->act_scanning) {
                 txagc = 0x3f;
                 if (dont_inc_cck_or_turboscanoff)
                         txagc = pwrlevel;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index d509cf6a1e4d..cffe30851f79 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -661,7 +661,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
 
 
         rx_status->mactime = GET_RX_STATUS_DESC_TSFL(pdesc);
-        if (phystatus == true) {
+        if (phystatus) {
                 p_drvinfo = (struct rx_fwinfo *)(skb->data +
                                                  stats->rx_bufshift);
                 _rtl92se_translate_rx_signal_stuff(hw, skb, stats, pdesc,
@@ -900,7 +900,7 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
 
 void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
 {
-        if (istx == true) {
+        if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
                         wmb();
@@ -941,7 +941,7 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)
 {
         u32 ret = 0;
 
-        if (istx == true) {
+        if (istx) {
                 switch (desc_name) {
                 case HW_DESC_OWN:
                         ret = GET_TX_DESC_OWN(desc);
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 75dff1e095f6..6890e197155b 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -937,7 +937,7 @@ struct rtl_mac {
         int n_channels;
         int n_bitrates;
 
-        bool offchan_deley;
+        bool offchan_delay;
 
         /*filters */
         u32 rx_conf;
@@ -1982,7 +1982,7 @@ static inline u16 rtl_get_tid(struct sk_buff *skb)
 
 static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw,
                                             struct ieee80211_vif *vif,
-                                            u8 *bssid)
+                                            const u8 *bssid)
 {
         return ieee80211_find_sta(vif, bssid);
 }