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

Commit 61f6bba0 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use new cfg80211_inform_bss_frame_data() API 



The new API is more easily extensible with a metadata struct
passed to it, use it in mac80211.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e2845c45

net/mac80211/ibss.c

+6 −5
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	struct cfg80211_chan_def chandef;

	struct ieee80211_channel *chan;

	struct beacon_data *presp;

	enum nl80211_bss_scan_width scan_width;

	struct cfg80211_inform_bss bss_meta = {};

	bool have_higher_than_11mbit;

	bool radar_required;

	int err;
@@ -383,10 +383,11 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	mod_timer(&ifibss->timer,

		  round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL));



	scan_width = cfg80211_chandef_to_scan_width(&chandef);

	bss = cfg80211_inform_bss_width_frame(local->hw.wiphy, chan,

					      scan_width, mgmt,

					      presp->head_len, 0, GFP_KERNEL);

	bss_meta.chan = chan;

	bss_meta.scan_width = cfg80211_chandef_to_scan_width(&chandef);

	bss = cfg80211_inform_bss_frame_data(local->hw.wiphy, &bss_meta, mgmt,

					     presp->head_len, GFP_KERNEL);



	cfg80211_put_bss(local->hw.wiphy, bss);

	netif_carrier_on(sdata->dev);

	cfg80211_ibss_joined(sdata->dev, ifibss->bssid, chan, GFP_KERNEL);

net/mac80211/scan.c

+9 −10
Original line number Diff line number Diff line
@@ -67,24 +67,23 @@ ieee80211_bss_info_update(struct ieee80211_local *local, 
	struct cfg80211_bss *cbss;

	struct ieee80211_bss *bss;

	int clen, srlen;

	enum nl80211_bss_scan_width scan_width;

	s32 signal = 0;

	struct cfg80211_inform_bss bss_meta = {};

	bool signal_valid;



	if (ieee80211_hw_check(&local->hw, SIGNAL_DBM))

		signal = rx_status->signal * 100;

		bss_meta.signal = rx_status->signal * 100;

	else if (ieee80211_hw_check(&local->hw, SIGNAL_UNSPEC))

		signal = (rx_status->signal * 100) / local->hw.max_signal;

		bss_meta.signal = (rx_status->signal * 100) / local->hw.max_signal;



	scan_width = NL80211_BSS_CHAN_WIDTH_20;

	bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_20;

	if (rx_status->flag & RX_FLAG_5MHZ)

		scan_width = NL80211_BSS_CHAN_WIDTH_5;

		bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_5;

	if (rx_status->flag & RX_FLAG_10MHZ)

		scan_width = NL80211_BSS_CHAN_WIDTH_10;

		bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_10;



	cbss = cfg80211_inform_bss_width_frame(local->hw.wiphy, channel,

					       scan_width, mgmt, len, signal,

					       GFP_ATOMIC);

	bss_meta.chan = channel;

	cbss = cfg80211_inform_bss_frame_data(local->hw.wiphy, &bss_meta,

					      mgmt, len, GFP_ATOMIC);

	if (!cbss)

		return NULL;

	/* In case the signal is invalid update the status */