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

11 files changed, 13 insertions, 57 deletions

diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index c1e065f136ba..204f46c4510d 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -217,19 +217,6 @@ static void rtl_tx_status(void *ppriv,
         }
 }
 
-static void rtl_rate_init(void *ppriv,
-                          struct ieee80211_supported_band *sband,
-                          struct ieee80211_sta *sta, void *priv_sta)
-{
-}
-
-static void rtl_rate_update(void *ppriv,
-                            struct ieee80211_supported_band *sband,
-                            struct ieee80211_sta *sta, void *priv_sta,
-                            u32 changed)
-{
-}
-
 static void *rtl_rate_alloc(struct ieee80211_hw *hw,
                 struct dentry *debugfsdir)
 {
@@ -274,8 +261,6 @@ static struct rate_control_ops rtl_rate_ops = {
         .free = rtl_rate_free,
         .alloc_sta = rtl_rate_alloc_sta,
         .free_sta = rtl_rate_free_sta,
-        .rate_init = rtl_rate_init,
-        .rate_update = rtl_rate_update,
         .tx_status = rtl_tx_status,
         .get_rate = rtl_get_rate,
 };
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 1cdf5a271c9f..b793a659a465 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -669,7 +669,8 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         u8 thermalvalue, delta, delta_lck, delta_iqk;
         long ele_a, ele_d, temp_cck, val_x, value32;
         long val_y, ele_c = 0;
-        u8 ofdm_index[2], cck_index = 0, ofdm_index_old[2], cck_index_old = 0;
+        u8 ofdm_index[2], ofdm_index_old[2], cck_index_old = 0;
+        s8 cck_index = 0;
         int i;
         bool is2t = IS_92C_SERIAL(rtlhal->version);
         s8 txpwr_level[2] = {0, 0};
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index b7e6607e6b6d..d9e659f92767 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -76,7 +76,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
                                       GFP_KERNEL, hw, rtl_fw_cb);
 
 
-        return 0;
+        return err;
 }
 
 static void rtl92cu_deinit_sw_vars(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index fd8df233ff22..5251fb8a111e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -841,9 +841,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
         long ele_a = 0, ele_d, temp_cck, val_x, value32;
         long val_y, ele_c = 0;
         u8 ofdm_index[2];
-        u8 cck_index = 0;
+        s8 cck_index = 0;
         u8 ofdm_index_old[2];
-        u8 cck_index_old = 0;
+        s8 cck_index_old = 0;
         u8 index;
         int i;
         bool is2t = IS_92D_SINGLEPHY(rtlhal->version);
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
index f55b1767ef57..35cb8f83eed4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
@@ -252,7 +252,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
         u16 box_reg = 0, box_extreg = 0;
         u8 u1tmp;
         bool isfw_rd = false;
-        bool bwrite_sucess = false;
+        bool bwrite_success = false;
         u8 wait_h2c_limmit = 100;
         u8 wait_writeh2c_limmit = 100;
         u8 boxcontent[4], boxextcontent[2];
@@ -291,7 +291,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                 }
         }
 
-        while (!bwrite_sucess) {
+        while (!bwrite_success) {
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -429,7 +429,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 }
 
-                bwrite_sucess = true;
+                bwrite_success = true;
 
                 rtlhal->last_hmeboxnum = boxnum + 1;
                 if (rtlhal->last_hmeboxnum == 4)
@@ -512,7 +512,6 @@ static bool _rtl8723ae_cmd_send_packet(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl8192_tx_ring *ring;
         struct rtl_tx_desc *pdesc;
-        u8 own;
         unsigned long flags;
         struct sk_buff *pskb = NULL;
 
@@ -525,7 +524,6 @@ static bool _rtl8723ae_cmd_send_packet(struct ieee80211_hw *hw,
         spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
 
         pdesc = &ring->desc[0];
-        own = (u8) rtlpriv->cfg->ops->get_desc((u8 *) pdesc, true, HW_DESC_OWN);
 
         rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *) pdesc, 1, 1, skb);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
index 887d521fe690..68c28340f791 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
@@ -1433,7 +1433,6 @@ static void _rtl8723ae_dm_bt_coexist_2_ant(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        u8 bt_retry_cnt;
         u8 bt_info_original;
         RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
                  "[BTCoex] Get bt info by fw!!\n");
@@ -1445,7 +1444,6 @@ static void _rtl8723ae_dm_bt_coexist_2_ant(struct ieee80211_hw *hw)
                                  "[BTCoex] c2h for btInfo not rcvd yet!!\n");
         }
 
-        bt_retry_cnt = rtlhal->hal_coex_8723.bt_retry_cnt;
         bt_info_original = rtlhal->hal_coex_8723.c2h_bt_info_original;
 
         /* when bt inquiry or page scan, we have to set h2c 0x25
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 0a8c03863fb2..149804816ac4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -703,11 +703,9 @@ static void _rtl8723ae_hw_configure(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 reg_bw_opmode;
-        u32 reg_ratr, reg_prsr;
+        u32 reg_prsr;
 
         reg_bw_opmode = BW_OPMODE_20MHZ;
-        reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
-            RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
         reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
 
         rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8);
@@ -2030,7 +2028,7 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;
+        enum rf_pwrstate e_rfpowerstate_toset;
         u8 u1tmp;
         bool actuallyset = false;
 
@@ -2049,8 +2047,6 @@ bool rtl8723ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
                 spin_unlock(&rtlpriv->locks.rf_ps_lock);
         }
 
-        cur_rfstate = ppsc->rfpwr_state;
-
         rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,
                        rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2)&~(BIT(1)));
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
index 3d8536bb0d2b..eafbb18dd48e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
@@ -614,17 +614,11 @@ bool rtl8723ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         int i;
-        bool rtstatus = true;
         u32 *radioa_array_table;
-        u32 *radiob_array_table;
-        u16 radioa_arraylen, radiob_arraylen;
+        u16 radioa_arraylen;
 
         radioa_arraylen = Rtl8723ERADIOA_1TARRAYLENGTH;
         radioa_array_table = RTL8723E_RADIOA_1TARRAY;
-        radiob_arraylen = RTL8723E_RADIOB_1TARRAYLENGTH;
-        radiob_array_table = RTL8723E_RADIOB_1TARRAY;
-
-        rtstatus = true;
 
         switch (rfpath) {
         case RF90_PATH_A:
@@ -1531,11 +1525,8 @@ static void _rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw,
                 0x522, 0x550, 0x551, 0x040
         };
         const u32 retrycount = 2;
-        u32 bbvalue;
 
         if (t == 0) {
-                bbvalue = rtl_get_bbreg(hw, 0x800, MASKDWORD);
-
                 phy_save_adda_regs(hw, adda_reg, rtlphy->adda_backup, 16);
                 phy_save_mac_regs(hw, iqk_mac_reg, rtlphy->iqk_mac_backup);
         }
@@ -1712,8 +1703,7 @@ void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
         long result[4][8];
         u8 i, final_candidate;
         bool patha_ok, pathb_ok;
-        long reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
-            reg_ecc, reg_tmp = 0;
+        long reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_tmp = 0;
         bool is12simular, is13simular, is23simular;
         bool start_conttx = false, singletone = false;
         u32 iqk_bb_reg[10] = {
@@ -1780,21 +1770,15 @@ void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery)
                 reg_e94 = result[i][0];
                 reg_e9c = result[i][1];
                 reg_ea4 = result[i][2];
-                reg_eac = result[i][3];
                 reg_eb4 = result[i][4];
                 reg_ebc = result[i][5];
-                reg_ec4 = result[i][6];
-                reg_ecc = result[i][7];
         }
         if (final_candidate != 0xff) {
                 rtlphy->reg_e94 = reg_e94 = result[final_candidate][0];
                 rtlphy->reg_e9c = reg_e9c = result[final_candidate][1];
                 reg_ea4 = result[final_candidate][2];
-                reg_eac = result[final_candidate][3];
                 rtlphy->reg_eb4 = reg_eb4 = result[final_candidate][4];
                 rtlphy->reg_ebc = reg_ebc = result[final_candidate][5];
-                reg_ec4 = result[final_candidate][6];
-                reg_ecc = result[final_candidate][7];
                 patha_ok = pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = rtlphy->reg_eb4 = 0x100;
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index ce8ad12bce5b..b1fd2b328abf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -244,7 +244,6 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         struct ieee80211_hdr *hdr;
         u8 *tmp_buf;
         u8 *praddr;
-        u8 *psaddr;
         __le16 fc;
         u16 type;
         bool packet_matchbssid, packet_toself, packet_beacon = false;
@@ -255,7 +254,6 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         fc = hdr->frame_control;
         type = WLAN_FC_GET_TYPE(fc);
         praddr = hdr->addr1;
-        psaddr = ieee80211_get_SA(hdr);
 
         packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
                             (!compare_ether_addr(mac->bssid,
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 1535efda3d52..d42bbe21ba6e 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -825,8 +825,6 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
         u32 ep_num;
         struct urb *_urb = NULL;
         struct sk_buff *_skb = NULL;
-        struct sk_buff_head *skb_list;
-        struct usb_anchor *urb_list;
 
         WARN_ON(NULL == rtlusb->usb_tx_aggregate_hdl);
         if (unlikely(IS_USB_STOP(rtlusb))) {
@@ -836,7 +834,6 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return;
         }
         ep_num = rtlusb->ep_map.ep_mapping[qnum];
-        skb_list = &rtlusb->tx_skb_queue[ep_num];
         _skb = skb;
         _urb = _rtl_usb_tx_urb_setup(hw, _skb, ep_num);
         if (unlikely(!_urb)) {
@@ -844,7 +841,6 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
                          "Can't allocate urb. Drop skb!\n");
                 return;
         }
-        urb_list = &rtlusb->tx_pending[ep_num];
         _rtl_submit_tx_urb(hw, _urb);
 }
 
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 21a5f4f4a135..f13258a8d995 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1702,7 +1702,7 @@ struct rtl_works {
 
 struct rtl_debug {
         u32 dbgp_type[DBGP_TYPE_MAX];
-        u32 global_debuglevel;
+        int global_debuglevel;
         u64 global_debugcomponents;
 
         /* add for proc debug */