diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-08-12 15:01:28 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-26 05:16:02 -0400 |
commit | 5bc8c1f2b070bab82ed738f98ecfac725e33c57f (patch) | |
tree | cc5d73214736192a08d1478da050459a360bf3fd /drivers/net/wireless/orinoco/scan.c | |
parent | 0e227084aee36b3ba27b4fc9cd9e425be6ce2ab8 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/orinoco/scan.c')
-rw-r--r-- | drivers/net/wireless/orinoco/scan.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c index e175b9b8561b..2c66166add70 100644 --- a/drivers/net/wireless/orinoco/scan.c +++ b/drivers/net/wireless/orinoco/scan.c | |||
@@ -123,9 +123,10 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv, | |||
123 | beacon_interval = le16_to_cpu(bss->a.beacon_interv); | 123 | beacon_interval = le16_to_cpu(bss->a.beacon_interv); |
124 | signal = SIGNAL_TO_MBM(le16_to_cpu(bss->a.level)); | 124 | signal = SIGNAL_TO_MBM(le16_to_cpu(bss->a.level)); |
125 | 125 | ||
126 | cbss = cfg80211_inform_bss(wiphy, channel, bss->a.bssid, timestamp, | 126 | cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, |
127 | capability, beacon_interval, ie_buf, ie_len, | 127 | bss->a.bssid, timestamp, capability, |
128 | signal, GFP_KERNEL); | 128 | beacon_interval, ie_buf, ie_len, signal, |
129 | GFP_KERNEL); | ||
129 | cfg80211_put_bss(wiphy, cbss); | 130 | cfg80211_put_bss(wiphy, cbss); |
130 | } | 131 | } |
131 | 132 | ||
@@ -156,9 +157,10 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, | |||
156 | ie = bss->data; | 157 | ie = bss->data; |
157 | signal = SIGNAL_TO_MBM(bss->level); | 158 | signal = SIGNAL_TO_MBM(bss->level); |
158 | 159 | ||
159 | cbss = cfg80211_inform_bss(wiphy, channel, bss->bssid, timestamp, | 160 | cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, |
160 | capability, beacon_interval, ie, ie_len, | 161 | bss->bssid, timestamp, capability, |
161 | signal, GFP_KERNEL); | 162 | beacon_interval, ie, ie_len, signal, |
163 | GFP_KERNEL); | ||
162 | cfg80211_put_bss(wiphy, cbss); | 164 | cfg80211_put_bss(wiphy, cbss); |
163 | } | 165 | } |
164 | 166 | ||