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

Commit b9771d41 authored by Johannes Berg's avatar Johannes Berg Committed by Johannes Berg
Browse files

mac80211: support scan features for improved scan privacy 



Support the new random SN and minimal probe request contents
scan flags for the case of software scan - for hardware scan
the drivers need to opt in, but may need to do only that,
depending on their implementation.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
parent 2e076f19

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -3486,7 +3486,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
	}



	local_bh_disable();

	ieee80211_xmit(sdata, sta, skb);

	ieee80211_xmit(sdata, sta, skb, 0);

	local_bh_enable();



	ret = 0;

net/mac80211/ieee80211_i.h

+9 −5
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ typedef unsigned __bitwise ieee80211_tx_result; 
#define TX_DROP		((__force ieee80211_tx_result) 1u)

#define TX_QUEUED	((__force ieee80211_tx_result) 2u)



#define IEEE80211_TX_NO_SEQNO		BIT(0)

#define IEEE80211_TX_UNICAST		BIT(1)

#define IEEE80211_TX_PS_BUFFERED	BIT(2)
@@ -1880,19 +1881,20 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata, 
void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,

			       bool bss_notify, bool enable_qos);

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,

		    struct sta_info *sta, struct sk_buff *skb);

		    struct sta_info *sta, struct sk_buff *skb,

		    u32 txdata_flags);



void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,

				 struct sk_buff *skb, int tid,

				 enum nl80211_band band);

				 enum nl80211_band band, u32 txdata_flags);



static inline void

ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,

			  struct sk_buff *skb, int tid,

			  enum nl80211_band band)

			  enum nl80211_band band, u32 txdata_flags)

{

	rcu_read_lock();

	__ieee80211_tx_skb_tid_band(sdata, skb, tid, band);

	__ieee80211_tx_skb_tid_band(sdata, skb, tid, band, txdata_flags);

	rcu_read_unlock();

}
@@ -1910,7 +1912,7 @@ static inline void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata, 
	}



	__ieee80211_tx_skb_tid_band(sdata, skb, tid,

				    chanctx_conf->def.chan->band);

				    chanctx_conf->def.chan->band, 0);

	rcu_read_unlock();

}
@@ -2034,6 +2036,8 @@ void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, 


enum {

	IEEE80211_PROBE_FLAG_DIRECTED		= BIT(0),

	IEEE80211_PROBE_FLAG_MIN_CONTENT	= BIT(1),

	IEEE80211_PROBE_FLAG_RANDOM_SN		= BIT(2),

};



int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,

net/mac80211/main.c

+11 −2
Original line number Diff line number Diff line
@@ -557,10 +557,19 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);



	if (!ops->hw_scan)

	if (!ops->hw_scan) {

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

				   NL80211_FEATURE_AP_SCAN;



		/*

		 * if the driver behaves correctly using the probe request

		 * (template) from mac80211, then both of these should be

		 * supported even with hw scan - but let drivers opt in.

		 */

		wiphy_ext_feature_set(wiphy,

				      NL80211_EXT_FEATURE_SCAN_RANDOM_SN);

		wiphy_ext_feature_set(wiphy,

				      NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT);

	}



	if (!ops->set_key)

		wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

net/mac80211/offchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc, 
	if (roc->mgmt_tx_cookie) {

		if (!WARN_ON(!roc->frame)) {

			ieee80211_tx_skb_tid_band(roc->sdata, roc->frame, 7,

						  roc->chan->band);

						  roc->chan->band, 0);

			roc->frame = NULL;

		}

	} else {

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -3241,7 +3241,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx) 
		}



		__ieee80211_tx_skb_tid_band(rx->sdata, nskb, 7,

					    status->band);

					    status->band, 0);

	}

	dev_kfree_skb(rx->skb);

	return RX_QUEUED;