wifi: mac80211: remove sta_info_tx_streams()

The function is unused since commit 52b4810bed83 ("mac80211: Remove
support for changing AP SMPS mode") so we can just remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 9a70d846d0dda9452ba3c7c83d391745cdb75dee..6f6d83def8b8162ec7c9316ecc61865b60c60999 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2093,41 +2093,6 @@ int sta_info_move_state(struct sta_info *sta,
        return 0;
 }
 
-u8 sta_info_tx_streams(struct sta_info *sta)
-{
-       struct ieee80211_sta_ht_cap *ht_cap = &sta->sta.deflink.ht_cap;
-       u8 rx_streams;
-
-       if (!sta->sta.deflink.ht_cap.ht_supported)
-               return 1;
-
-       if (sta->sta.deflink.vht_cap.vht_supported) {
-               int i;
-               u16 tx_mcs_map =
-                       le16_to_cpu(sta->sta.deflink.vht_cap.vht_mcs.tx_mcs_map);
-
-               for (i = 7; i >= 0; i--)
-                       if ((tx_mcs_map & (0x3 << (i * 2))) !=
-                           IEEE80211_VHT_MCS_NOT_SUPPORTED)
-                               return i + 1;
-       }
-
-       if (ht_cap->mcs.rx_mask[3])
-               rx_streams = 4;
-       else if (ht_cap->mcs.rx_mask[2])
-               rx_streams = 3;
-       else if (ht_cap->mcs.rx_mask[1])
-               rx_streams = 2;
-       else
-               rx_streams = 1;
-
-       if (!(ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_RX_DIFF))
-               return rx_streams;
-
-       return ((ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
-                       >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT) + 1;
-}
-
 static struct ieee80211_sta_rx_stats *
 sta_get_last_rx_stats(struct sta_info *sta)
 {

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index aa6950aa49a9134ce30abd9ecc1c0f87ef17fb1e..134a7dad0ac488178ddc0778a92803635d67f306 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -891,7 +891,6 @@ u32 sta_get_expected_throughput(struct sta_info *sta);
 
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                          unsigned long exp_time);
-u8 sta_info_tx_streams(struct sta_info *sta);
 
 void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta);
 void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta);