cfg80211: allow passing frame type to cfg80211_inform_bss()

When using the cfg80211_inform_bss[_width]() functions drivers
cannot currently indicate whether the data was received in a
beacon or probe response. Fix that by passing a new enum that
indicates such (or unknown).

For good measure, use it in ath6kl.

Acked-by: Kalle Valo <kvalo@qca.qualcomm.com> [ath6kl]
Acked-by: Arend van Spriel <arend@broadcom.com> [brcmfmac]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index d2a9a08210be..1a4facd1fbf3 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2022,9 +2022,10 @@ static bool rndis_bss_info_update(struct usbnet *usbdev,
         capability = le16_to_cpu(fixed->capabilities);
         beacon_interval = le16_to_cpu(fixed->beacon_interval);
 
-        bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac,
-                timestamp, capability, beacon_interval, ie, ie_len, signal,
-                GFP_KERNEL);
+        bss = cfg80211_inform_bss(priv->wdev.wiphy, channel,
+                                  CFG80211_BSS_FTYPE_UNKNOWN, bssid->mac,
+                                  timestamp, capability, beacon_interval,
+                                  ie, ie_len, signal, GFP_KERNEL);
         cfg80211_put_bss(priv->wdev.wiphy, bss);
 
         return (bss != NULL);
@@ -2711,9 +2712,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
                 bssid, (u32)timestamp, capability, beacon_period, ie_len,
                 ssid.essid, signal);
 
-        bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid,
-                timestamp, capability, beacon_period, ie_buf, ie_len,
-                signal, GFP_KERNEL);
+        bss = cfg80211_inform_bss(priv->wdev.wiphy, channel,
+                                  CFG80211_BSS_FTYPE_UNKNOWN, bssid,
+                                  timestamp, capability, beacon_period,
+                                  ie_buf, ie_len, signal, GFP_KERNEL);
         cfg80211_put_bss(priv->wdev.wiphy, bss);
 }