cfg80211: clean up cfg80211_inform_single_bss_frame_data()

cfg80211_inform_single_bss_frame_data() doesn't need the
non_tx_data data argument since it's always NULL.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Link: https://lore.kernel.org/r/20190703133823.10530-1-johannes@sipsolutions.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index d66e6d4b75555e991699fbd0cd4dbd7e5159942a..70d061ed9cb69fbceec89bfb2e50a1b98f2f240a 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1776,7 +1776,6 @@ static struct cfg80211_bss *
 cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
                                      struct cfg80211_inform_bss *data,
                                      struct ieee80211_mgmt *mgmt, size_t len,
-                                     struct cfg80211_non_tx_bss *non_tx_data,
                                      gfp_t gfp)
 {
        struct cfg80211_internal_bss tmp = {}, *res;
@@ -1835,11 +1834,6 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
        tmp.pub.chains = data->chains;
        memcpy(tmp.pub.chain_signal, data->chain_signal, IEEE80211_MAX_CHAINS);
        ether_addr_copy(tmp.parent_bssid, data->parent_bssid);
-       if (non_tx_data) {
-               tmp.pub.transmitted_bss = non_tx_data->tx_bss;
-               tmp.pub.bssid_index = non_tx_data->bssid_index;
-               tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator;
-       }
 
        signal_valid = abs(data->chan->center_freq - channel->center_freq) <=
                wiphy->max_adj_channel_rssi_comp;
@@ -1877,7 +1871,7 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
        struct cfg80211_non_tx_bss non_tx_data;
 
        res = cfg80211_inform_single_bss_frame_data(wiphy, data, mgmt,
-                                                   len, NULL, gfp);
+                                                   len, gfp);
        if (!res || !wiphy->support_mbssid ||
            !cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ie, ielen))
                return res;