Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bc8c1f2 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0e227084

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif, 
		memcpy(ie + 2, vif->ssid, vif->ssid_len);

		memcpy(ie + 2 + vif->ssid_len, beacon_ie, beacon_ie_len);

		bss = cfg80211_inform_bss(ar->wiphy, chan,

					  CFG80211_BSS_FTYPE_UNKNOWN,

					  bssid, 0, cap_val, 100,

					  ie, 2 + vif->ssid_len + beacon_ie_len,

					  0, GFP_KERNEL);

drivers/net/wireless/ath/ath6kl/wmi.c

+9 −34
Original line number Diff line number Diff line
@@ -1092,7 +1092,6 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len, 
	u8 *buf;

	struct ieee80211_channel *channel;

	struct ath6kl *ar = wmi->parent_dev;

	struct ieee80211_mgmt *mgmt;

	struct cfg80211_bss *bss;



	if (len <= sizeof(struct wmi_bss_info_hdr2))
@@ -1138,39 +1137,15 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len, 
		}

	}



	/*

	 * In theory, use of cfg80211_inform_bss() would be more natural here

	 * since we do not have the full frame. However, at least for now,

	 * cfg80211 can only distinguish Beacon and Probe Response frames from

	 * each other when using cfg80211_inform_bss_frame(), so let's build a

	 * fake IEEE 802.11 header to be able to take benefit of this.

	 */

	mgmt = kmalloc(24 + len, GFP_ATOMIC);

	if (mgmt == NULL)

		return -EINVAL;



	if (bih->frame_type == BEACON_FTYPE) {

		mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |

						  IEEE80211_STYPE_BEACON);

		memset(mgmt->da, 0xff, ETH_ALEN);

	} else {

		struct net_device *dev = vif->ndev;



		mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |

						  IEEE80211_STYPE_PROBE_RESP);

		memcpy(mgmt->da, dev->dev_addr, ETH_ALEN);

	}

	mgmt->duration = cpu_to_le16(0);

	memcpy(mgmt->sa, bih->bssid, ETH_ALEN);

	memcpy(mgmt->bssid, bih->bssid, ETH_ALEN);

	mgmt->seq_ctrl = cpu_to_le16(0);



	memcpy(&mgmt->u.beacon, buf, len);



	bss = cfg80211_inform_bss_frame(ar->wiphy, channel, mgmt,

					24 + len, (bih->snr - 95) * 100,

					GFP_ATOMIC);

	kfree(mgmt);

	bss = cfg80211_inform_bss(ar->wiphy, channel,

				  bih->frame_type == BEACON_FTYPE ?

					CFG80211_BSS_FTYPE_BEACON :

					CFG80211_BSS_FTYPE_PRESP,

				  bih->bssid, get_unaligned_le64((__le64 *)buf),

				  get_unaligned_le16(((__le16 *)buf) + 5),

				  get_unaligned_le16(((__le16 *)buf) + 4),

				  buf + 8 + 2 + 2, len - 8 - 2 - 2,

				  (bih->snr - 95) * 100, GFP_ATOMIC);

	if (bss == NULL)

		return -ENOMEM;

	cfg80211_put_bss(ar->wiphy, bss);

drivers/net/wireless/ath/wil6210/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
				    rx_mgmt_frame->bssid);

			cfg80211_put_bss(wiphy, bss);

		} else {

			wil_err(wil, "cfg80211_inform_bss() failed\n");

			wil_err(wil, "cfg80211_inform_bss_frame() failed\n");

		}

	} else {

		cfg80211_rx_mgmt(wil->wdev, freq, signal,

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+12 −6
Original line number Diff line number Diff line
@@ -2394,9 +2394,13 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg, 
	brcmf_dbg(CONN, "Beacon interval: %d\n", notify_interval);

	brcmf_dbg(CONN, "Signal: %d\n", notify_signal);



	bss = cfg80211_inform_bss(wiphy, notify_channel, (const u8 *)bi->BSSID,

		0, notify_capability, notify_interval, notify_ie,

		notify_ielen, notify_signal, GFP_KERNEL);

	bss = cfg80211_inform_bss(wiphy, notify_channel,

				  CFG80211_BSS_FTYPE_UNKNOWN,

				  (const u8 *)bi->BSSID,

				  0, notify_capability,

				  notify_interval, notify_ie,

				  notify_ielen, notify_signal,

				  GFP_KERNEL);



	if (!bss)

		return -ENOMEM;
@@ -2498,9 +2502,11 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg, 
	brcmf_dbg(CONN, "beacon interval: %d\n", notify_interval);

	brcmf_dbg(CONN, "signal: %d\n", notify_signal);



	bss = cfg80211_inform_bss(wiphy, notify_channel, bssid,

		0, notify_capability, notify_interval,

		notify_ie, notify_ielen, notify_signal, GFP_KERNEL);

	bss = cfg80211_inform_bss(wiphy, notify_channel,

				  CFG80211_BSS_FTYPE_UNKNOWN, bssid, 0,

				  notify_capability, notify_interval,

				  notify_ie, notify_ielen, notify_signal,

				  GFP_KERNEL);



	if (!bss) {

		err = -ENOMEM;

drivers/net/wireless/libertas/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, 
			if (channel &&

			    !(channel->flags & IEEE80211_CHAN_DISABLED)) {

				bss = cfg80211_inform_bss(wiphy, channel,

					CFG80211_BSS_FTYPE_UNKNOWN,

					bssid, get_unaligned_le64(tsfdesc),

					capa, intvl, ie, ielen,

					LBS_SCAN_RSSI_TO_MBM(rssi),
@@ -1754,6 +1755,7 @@ static void lbs_join_post(struct lbs_private *priv, 


	bss = cfg80211_inform_bss(priv->wdev->wiphy,

				  params->chandef.chan,

				  CFG80211_BSS_FTYPE_UNKNOWN,

				  bssid,

				  0,

				  capability,