ath10k: remove set but not used variable 'num_tdls_vifs'
authorYueHaibing <yuehaibing@huawei.com>
Thu, 20 Dec 2018 07:53:10 +0000 (09:53 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 20 Dec 2018 16:46:17 +0000 (18:46 +0200)
Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/wireless/ath/ath10k/mac.c: In function 'ath10k_sta_state':
drivers/net/wireless/ath/ath10k/mac.c:6238:7: warning:
 variable 'num_tdls_vifs' set but not used [-Wunused-but-set-variable]

'num_tdls_vifs' not used any more after
  9a993cc1ea95 ("ath10k: fix the logic of limiting tdls peer counts")

Also, remove the single called function ath10k_mac_tdls_vifs_count
and ath10k_mac_tdls_vifs_count_iter.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath10k/mac.c

index 1db2a30..9d75de7 100644 (file)
@@ -5754,30 +5754,6 @@ static int ath10k_mac_tdls_vif_stations_count(struct ieee80211_hw *hw,
        return data.num_tdls_stations;
 }
 
-static void ath10k_mac_tdls_vifs_count_iter(void *data, u8 *mac,
-                                           struct ieee80211_vif *vif)
-{
-       struct ath10k_vif *arvif = (void *)vif->drv_priv;
-       int *num_tdls_vifs = data;
-
-       if (vif->type != NL80211_IFTYPE_STATION)
-               return;
-
-       if (ath10k_mac_tdls_vif_stations_count(arvif->ar->hw, vif) > 0)
-               (*num_tdls_vifs)++;
-}
-
-static int ath10k_mac_tdls_vifs_count(struct ieee80211_hw *hw)
-{
-       int num_tdls_vifs = 0;
-
-       ieee80211_iterate_active_interfaces_atomic(hw,
-                                                  IEEE80211_IFACE_ITER_NORMAL,
-                                                  ath10k_mac_tdls_vifs_count_iter,
-                                                  &num_tdls_vifs);
-       return num_tdls_vifs;
-}
-
 static int ath10k_hw_scan(struct ieee80211_hw *hw,
                          struct ieee80211_vif *vif,
                          struct ieee80211_scan_request *hw_req)
@@ -6285,7 +6261,6 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
                 */
                enum wmi_peer_type peer_type = WMI_PEER_TYPE_DEFAULT;
                u32 num_tdls_stations;
-               u32 num_tdls_vifs;
 
                ath10k_dbg(ar, ATH10K_DBG_MAC,
                           "mac vdev %d peer create %pM (new sta) sta %d / %d peer %d / %d\n",
@@ -6303,7 +6278,6 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
                }
 
                num_tdls_stations = ath10k_mac_tdls_vif_stations_count(hw, vif);
-               num_tdls_vifs = ath10k_mac_tdls_vifs_count(hw);
 
                if (sta->tdls) {
                        if (num_tdls_stations >= ar->max_num_tdls_vdevs) {