mac80211: fix race condition between assoc_done and first EAP packet (2a33bee2) · Commits · 戴 / test

net/mac80211/mlme.c

+53 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1482,10 +1482,14 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,

	ifmgd->aid = aid;		ifmgd->aid = aid;

	sta = sta_info_alloc(sdata, cbss->bssid, GFP_KERNEL);		mutex_lock(&sdata->local->sta_mtx);
	if (!sta) {		/*
	printk(KERN_DEBUG "%s: failed to alloc STA entry for"		* station info was already allocated and inserted before
	" the AP\n", sdata->name);		* the association and should be available to us
			*/
			sta = sta_info_get_rx(sdata, cbss->bssid);
			if (WARN_ON(!sta)) {
			mutex_unlock(&sdata->local->sta_mtx);
	return false;		return false;
	}		}

	@@ -1556,7 +1560,8 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
	if (elems.wmm_param)		if (elems.wmm_param)
	set_sta_flags(sta, WLAN_STA_WME);		set_sta_flags(sta, WLAN_STA_WME);

	err = sta_info_insert(sta);		/* sta_info_reinsert will also unlock the mutex lock */
			err = sta_info_reinsert(sta);
	sta = NULL;		sta = NULL;
	if (err) {		if (err) {
	printk(KERN_DEBUG "%s: failed to insert STA entry for"		printk(KERN_DEBUG "%s: failed to insert STA entry for"
	@@ -2429,6 +2434,32 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
	return 0;		return 0;
	}		}

			/* create and insert a dummy station entry */
			static int ieee80211_pre_assoc(struct ieee80211_sub_if_data *sdata,
			u8 *bssid) {
			struct sta_info *sta;
			int err;

			sta = sta_info_alloc(sdata, bssid, GFP_KERNEL);
			if (!sta) {
			printk(KERN_DEBUG "%s: failed to alloc STA entry for"
			" the AP\n", sdata->name);
			return -ENOMEM;
			}

			sta->dummy = true;

			err = sta_info_insert(sta);
			sta = NULL;
			if (err) {
			printk(KERN_DEBUG "%s: failed to insert Dummy STA entry for"
			" the AP (error %d)\n", sdata->name, err);
			return err;
			}

			return 0;
			}

	static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,		static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
	struct sk_buff *skb)		struct sk_buff *skb)
	{		{
	@@ -2436,9 +2467,11 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
	struct ieee80211_mgmt *mgmt;		struct ieee80211_mgmt *mgmt;
	struct ieee80211_rx_status *rx_status;		struct ieee80211_rx_status *rx_status;
	struct ieee802_11_elems elems;		struct ieee802_11_elems elems;
			struct cfg80211_bss *cbss = wk->assoc.bss;
	u16 status;		u16 status;

	if (!skb) {		if (!skb) {
			sta_info_destroy_addr(wk->sdata, cbss->bssid);
	cfg80211_send_assoc_timeout(wk->sdata->dev, wk->filter_ta);		cfg80211_send_assoc_timeout(wk->sdata->dev, wk->filter_ta);
	goto destroy;		goto destroy;
	}		}
	@@ -2468,12 +2501,16 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
	if (!ieee80211_assoc_success(wk, mgmt, skb->len)) {		if (!ieee80211_assoc_success(wk, mgmt, skb->len)) {
	mutex_unlock(&wk->sdata->u.mgd.mtx);		mutex_unlock(&wk->sdata->u.mgd.mtx);
	/* oops -- internal error -- send timeout for now */		/* oops -- internal error -- send timeout for now */
			sta_info_destroy_addr(wk->sdata, cbss->bssid);
	cfg80211_send_assoc_timeout(wk->sdata->dev,		cfg80211_send_assoc_timeout(wk->sdata->dev,
	wk->filter_ta);		wk->filter_ta);
	return WORK_DONE_DESTROY;		return WORK_DONE_DESTROY;
	}		}

	mutex_unlock(&wk->sdata->u.mgd.mtx);		mutex_unlock(&wk->sdata->u.mgd.mtx);
			} else {
			/* assoc failed - destroy the dummy station entry */
			sta_info_destroy_addr(wk->sdata, cbss->bssid);
	}		}

	cfg80211_send_rx_assoc(wk->sdata->dev, skb->data, skb->len);		cfg80211_send_rx_assoc(wk->sdata->dev, skb->data, skb->len);
	@@ -2492,7 +2529,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
	struct ieee80211_bss bss = (void )req->bss->priv;		struct ieee80211_bss bss = (void )req->bss->priv;
	struct ieee80211_work *wk;		struct ieee80211_work *wk;
	const u8 *ssid;		const u8 *ssid;
	int i;		int i, err;

	mutex_lock(&ifmgd->mtx);		mutex_lock(&ifmgd->mtx);
	if (ifmgd->associated) {		if (ifmgd->associated) {
	@@ -2517,6 +2554,16 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
	if (!wk)		if (!wk)
	return -ENOMEM;		return -ENOMEM;

			/*
			* create a dummy station info entry in order
			* to start accepting incoming EAPOL packets from the station
			*/
			err = ieee80211_pre_assoc(sdata, req->bss->bssid);
			if (err) {
			kfree(wk);
			return err;
			}

	ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N;		ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N;
	ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;		ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;

net/mac80211/rx.c

+17 −4

Original line number	Original line	Diff line number	Diff line
	@@ -850,8 +850,21 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
	ieee80211_is_pspoll(hdr->frame_control)) &&		ieee80211_is_pspoll(hdr->frame_control)) &&
	rx->sdata->vif.type != NL80211_IFTYPE_ADHOC &&		rx->sdata->vif.type != NL80211_IFTYPE_ADHOC &&
	rx->sdata->vif.type != NL80211_IFTYPE_WDS &&		rx->sdata->vif.type != NL80211_IFTYPE_WDS &&
	(!rx->sta \|\| !test_sta_flags(rx->sta, WLAN_STA_ASSOC))))		(!rx->sta \|\| !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) {
			if (rx->sta && rx->sta->dummy &&
			ieee80211_is_data_present(hdr->frame_control)) {
			u16 ethertype;
			u8 *payload;

			payload = rx->skb->data +
			ieee80211_hdrlen(hdr->frame_control);
			ethertype = (payload[6] << 8) \| payload[7];
			if (cpu_to_be16(ethertype) ==
			rx->sdata->control_port_protocol)
			return RX_CONTINUE;
			}
	return RX_DROP_MONITOR;		return RX_DROP_MONITOR;
			}

	return RX_CONTINUE;		return RX_CONTINUE;
	}		}
	@@ -2808,7 +2821,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
	if (ieee80211_is_data(fc)) {		if (ieee80211_is_data(fc)) {
	prev_sta = NULL;		prev_sta = NULL;

	for_each_sta_info(local, hdr->addr2, sta, tmp) {		for_each_sta_info_rx(local, hdr->addr2, sta, tmp) {
	if (!prev_sta) {		if (!prev_sta) {
	prev_sta = sta;		prev_sta = sta;
	continue;		continue;
	@@ -2852,7 +2865,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
	continue;		continue;
	}		}

	rx.sta = sta_info_get_bss(prev, hdr->addr2);		rx.sta = sta_info_get_bss_rx(prev, hdr->addr2);
	rx.sdata = prev;		rx.sdata = prev;
	ieee80211_prepare_and_rx_handle(&rx, skb, false);		ieee80211_prepare_and_rx_handle(&rx, skb, false);

	@@ -2860,7 +2873,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
	}		}

	if (prev) {		if (prev) {
	rx.sta = sta_info_get_bss(prev, hdr->addr2);		rx.sta = sta_info_get_bss_rx(prev, hdr->addr2);
	rx.sdata = prev;		rx.sdata = prev;

	if (ieee80211_prepare_and_rx_handle(&rx, skb, true))		if (ieee80211_prepare_and_rx_handle(&rx, skb, true))

net/mac80211/sta_info.c

+137 −49

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,27 @@ struct sta_info sta_info_get(struct ieee80211_sub_if_data sdata,
	struct ieee80211_local *local = sdata->local;		struct ieee80211_local *local = sdata->local;
	struct sta_info *sta;		struct sta_info *sta;

			sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
			lockdep_is_held(&local->sta_lock) \|\|
			lockdep_is_held(&local->sta_mtx));
			while (sta) {
			if (sta->sdata == sdata && !sta->dummy &&
			memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
			break;
			sta = rcu_dereference_check(sta->hnext,
			lockdep_is_held(&local->sta_lock) \|\|
			lockdep_is_held(&local->sta_mtx));
			}
			return sta;
			}

			/* get a station info entry even if it is a dummy station*/
			struct sta_info sta_info_get_rx(struct ieee80211_sub_if_data sdata,
			const u8 *addr)
			{
			struct ieee80211_local *local = sdata->local;
			struct sta_info *sta;

	sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],		sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
	lockdep_is_held(&local->sta_lock) \|\|		lockdep_is_held(&local->sta_lock) \|\|
	lockdep_is_held(&local->sta_mtx));		lockdep_is_held(&local->sta_mtx));
	@@ -120,6 +141,32 @@ struct sta_info sta_info_get_bss(struct ieee80211_sub_if_data sdata,
	struct ieee80211_local *local = sdata->local;		struct ieee80211_local *local = sdata->local;
	struct sta_info *sta;		struct sta_info *sta;

			sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
			lockdep_is_held(&local->sta_lock) \|\|
			lockdep_is_held(&local->sta_mtx));
			while (sta) {
			if ((sta->sdata == sdata \|\|
			(sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
			!sta->dummy &&
			memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
			break;
			sta = rcu_dereference_check(sta->hnext,
			lockdep_is_held(&local->sta_lock) \|\|
			lockdep_is_held(&local->sta_mtx));
			}
			return sta;
			}

			/*
			* Get sta info either from the specified interface
			* or from one of its vlans (including dummy stations)
			*/
			struct sta_info sta_info_get_bss_rx(struct ieee80211_sub_if_data sdata,
			const u8 *addr)
			{
			struct ieee80211_local *local = sdata->local;
			struct sta_info *sta;

	sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],		sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
	lockdep_is_held(&local->sta_lock) \|\|		lockdep_is_held(&local->sta_lock) \|\|
	lockdep_is_held(&local->sta_mtx));		lockdep_is_held(&local->sta_mtx));
	@@ -280,7 +327,8 @@ struct sta_info sta_info_alloc(struct ieee80211_sub_if_data sdata,
	return sta;		return sta;
	}		}

	static int sta_info_finish_insert(struct sta_info *sta, bool async)		static int sta_info_finish_insert(struct sta_info *sta,
			bool async, bool dummy_reinsert)
	{		{
	struct ieee80211_local *local = sta->local;		struct ieee80211_local *local = sta->local;
	struct ieee80211_sub_if_data *sdata = sta->sdata;		struct ieee80211_sub_if_data *sdata = sta->sdata;
	@@ -290,6 +338,7 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)

	lockdep_assert_held(&local->sta_mtx);		lockdep_assert_held(&local->sta_mtx);

			if (!sta->dummy \|\| dummy_reinsert) {
	/* notify driver */		/* notify driver */
	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
	sdata = container_of(sdata->bss,		sdata = container_of(sdata->bss,
	@@ -299,8 +348,8 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)
	if (err) {		if (err) {
	if (!async)		if (!async)
	return err;		return err;
	printk(KERN_DEBUG "%s: failed to add IBSS STA %pM to driver (%d)"		printk(KERN_DEBUG "%s: failed to add IBSS STA %pM to "
	" - keeping it anyway.\n",		"driver (%d) - keeping it anyway.\n",
	sdata->name, sta->sta.addr, err);		sdata->name, sta->sta.addr, err);
	} else {		} else {
	sta->uploaded = true;		sta->uploaded = true;
	@@ -313,7 +362,9 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)
	}		}

	sdata = sta->sdata;		sdata = sta->sdata;
			}

			if (!dummy_reinsert) {
	if (!async) {		if (!async) {
	local->num_sta++;		local->num_sta++;
	local->sta_generation++;		local->sta_generation++;
	@@ -326,7 +377,11 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)
	}		}

	list_add(&sta->list, &local->sta_list);		list_add(&sta->list, &local->sta_list);
			} else {
			sta->dummy = false;
			}

			if (!sta->dummy) {
	ieee80211_sta_debugfs_add(sta);		ieee80211_sta_debugfs_add(sta);
	rate_control_add_sta_debugfs(sta);		rate_control_add_sta_debugfs(sta);

	@@ -334,7 +389,7 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)
	sinfo.filled = 0;		sinfo.filled = 0;
	sinfo.generation = local->sta_generation;		sinfo.generation = local->sta_generation;
	cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);		cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
			}

	return 0;		return 0;
	}		}
	@@ -351,7 +406,7 @@ static void sta_info_finish_pending(struct ieee80211_local *local)
	list_del(&sta->list);		list_del(&sta->list);
	spin_unlock_irqrestore(&local->sta_lock, flags);		spin_unlock_irqrestore(&local->sta_lock, flags);

	sta_info_finish_insert(sta, true);		sta_info_finish_insert(sta, true, false);

	spin_lock_irqsave(&local->sta_lock, flags);		spin_lock_irqsave(&local->sta_lock, flags);
	}		}
	@@ -395,7 +450,7 @@ static int sta_info_insert_ibss(struct sta_info *sta) __acquires(RCU)

	spin_lock_irqsave(&local->sta_lock, flags);		spin_lock_irqsave(&local->sta_lock, flags);
	/* check if STA exists already */		/* check if STA exists already */
	if (sta_info_get_bss(sdata, sta->sta.addr)) {		if (sta_info_get_bss_rx(sdata, sta->sta.addr)) {
	spin_unlock_irqrestore(&local->sta_lock, flags);		spin_unlock_irqrestore(&local->sta_lock, flags);
	rcu_read_lock();		rcu_read_lock();
	return -EEXIST;		return -EEXIST;
	@@ -431,6 +486,8 @@ static int sta_info_insert_non_ibss(struct sta_info *sta) __acquires(RCU)
	struct ieee80211_local *local = sta->local;		struct ieee80211_local *local = sta->local;
	struct ieee80211_sub_if_data *sdata = sta->sdata;		struct ieee80211_sub_if_data *sdata = sta->sdata;
	unsigned long flags;		unsigned long flags;
			struct sta_info *exist_sta;
			bool dummy_reinsert = false;
	int err = 0;		int err = 0;

	lockdep_assert_held(&local->sta_mtx);		lockdep_assert_held(&local->sta_mtx);
	@@ -446,17 +503,28 @@ static int sta_info_insert_non_ibss(struct sta_info *sta) __acquires(RCU)
	*/		*/

	spin_lock_irqsave(&local->sta_lock, flags);		spin_lock_irqsave(&local->sta_lock, flags);
	/* check if STA exists already */		/*
	if (sta_info_get_bss(sdata, sta->sta.addr)) {		* check if STA exists already.
			* only accept a scenario of a second call to sta_info_insert_non_ibss
			* with a dummy station entry that was inserted earlier
			* in that case - assume that the dummy station flag should
			* be removed.
			*/
			exist_sta = sta_info_get_bss_rx(sdata, sta->sta.addr);
			if (exist_sta) {
			if (exist_sta == sta && sta->dummy) {
			dummy_reinsert = true;
			} else {
	spin_unlock_irqrestore(&local->sta_lock, flags);		spin_unlock_irqrestore(&local->sta_lock, flags);
	mutex_unlock(&local->sta_mtx);		mutex_unlock(&local->sta_mtx);
	rcu_read_lock();		rcu_read_lock();
	return -EEXIST;		return -EEXIST;
	}		}
			}

	spin_unlock_irqrestore(&local->sta_lock, flags);		spin_unlock_irqrestore(&local->sta_lock, flags);

	err = sta_info_finish_insert(sta, false);		err = sta_info_finish_insert(sta, false, dummy_reinsert);
	if (err) {		if (err) {
	mutex_unlock(&local->sta_mtx);		mutex_unlock(&local->sta_mtx);
	rcu_read_lock();		rcu_read_lock();
	@@ -464,7 +532,8 @@ static int sta_info_insert_non_ibss(struct sta_info *sta) __acquires(RCU)
	}		}

	#ifdef CONFIG_MAC80211_VERBOSE_DEBUG		#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
	wiphy_debug(local->hw.wiphy, "Inserted STA %pM\n", sta->sta.addr);		wiphy_debug(local->hw.wiphy, "Inserted %sSTA %pM\n",
			sta->dummy ? "dummy " : "", sta->sta.addr);
	#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */		#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */

	/* move reference to rcu-protected */		/* move reference to rcu-protected */
	@@ -535,6 +604,25 @@ int sta_info_insert(struct sta_info *sta)
	return err;		return err;
	}		}

			/* Caller must hold sta->local->sta_mtx */
			int sta_info_reinsert(struct sta_info *sta)
			{
			struct ieee80211_local *local = sta->local;
			int err = 0;

			err = sta_info_insert_check(sta);
			if (err) {
			mutex_unlock(&local->sta_mtx);
			return err;
			}

			might_sleep();

			err = sta_info_insert_non_ibss(sta);
			rcu_read_unlock();
			return err;
			}

	static inline void __bss_tim_set(struct ieee80211_if_ap *bss, u16 aid)		static inline void __bss_tim_set(struct ieee80211_if_ap *bss, u16 aid)
	{		{
	/*		/*
	@@ -775,7 +863,7 @@ int sta_info_destroy_addr(struct ieee80211_sub_if_data sdata, const u8 addr)
	int ret;		int ret;

	mutex_lock(&sdata->local->sta_mtx);		mutex_lock(&sdata->local->sta_mtx);
	sta = sta_info_get(sdata, addr);		sta = sta_info_get_rx(sdata, addr);
	ret = __sta_info_destroy(sta);		ret = __sta_info_destroy(sta);
	mutex_unlock(&sdata->local->sta_mtx);		mutex_unlock(&sdata->local->sta_mtx);

	@@ -789,7 +877,7 @@ int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
	int ret;		int ret;

	mutex_lock(&sdata->local->sta_mtx);		mutex_lock(&sdata->local->sta_mtx);
	sta = sta_info_get_bss(sdata, addr);		sta = sta_info_get_bss_rx(sdata, addr);
	ret = __sta_info_destroy(sta);		ret = __sta_info_destroy(sta);
	mutex_unlock(&sdata->local->sta_mtx);		mutex_unlock(&sdata->local->sta_mtx);

net/mac80211/sta_info.h

+29 −1

Original line number	Original line	Diff line number	Diff line
	@@ -238,10 +238,12 @@ struct sta_ampdu_mlme {
	* @plink_timer: peer link watch timer		* @plink_timer: peer link watch timer
	* @plink_timer_was_running: used by suspend/resume to restore timers		* @plink_timer_was_running: used by suspend/resume to restore timers
	* @debugfs: debug filesystem info		* @debugfs: debug filesystem info
	* @sta: station information we share with the driver
	* @dead: set to true when sta is unlinked		* @dead: set to true when sta is unlinked
	* @uploaded: set to true when sta is uploaded to the driver		* @uploaded: set to true when sta is uploaded to the driver
	* @lost_packets: number of consecutive lost packets		* @lost_packets: number of consecutive lost packets
			* @dummy: indicate a dummy station created for receiving
			* EAP frames before association
			* @sta: station information we share with the driver
	*/		*/
	struct sta_info {		struct sta_info {
	/* General information, mostly static */		/* General information, mostly static */
	@@ -336,6 +338,9 @@ struct sta_info {

	unsigned int lost_packets;		unsigned int lost_packets;

			/* should be right in front of sta to be in the same cache line */
			bool dummy;

	/* keep last! */		/* keep last! */
	struct ieee80211_sta sta;		struct ieee80211_sta sta;
	};		};
	@@ -436,9 +441,15 @@ rcu_dereference_protected_tid_tx(struct sta_info *sta, int tid)
	struct sta_info sta_info_get(struct ieee80211_sub_if_data sdata,		struct sta_info sta_info_get(struct ieee80211_sub_if_data sdata,
	const u8 *addr);		const u8 *addr);

			struct sta_info sta_info_get_rx(struct ieee80211_sub_if_data sdata,
			const u8 *addr);

	struct sta_info sta_info_get_bss(struct ieee80211_sub_if_data sdata,		struct sta_info sta_info_get_bss(struct ieee80211_sub_if_data sdata,
	const u8 *addr);		const u8 *addr);

			struct sta_info sta_info_get_bss_rx(struct ieee80211_sub_if_data sdata,
			const u8 *addr);

	static inline		static inline
	void for_each_sta_info_type_check(struct ieee80211_local *local,		void for_each_sta_info_type_check(struct ieee80211_local *local,
	const u8 *addr,		const u8 *addr,
	@@ -448,6 +459,22 @@ void for_each_sta_info_type_check(struct ieee80211_local *local,
	}		}

	#define for_each_sta_info(local, _addr, _sta, nxt) \		#define for_each_sta_info(local, _addr, _sta, nxt) \
			for ( /* initialise loop */ \
			_sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\
			nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \
			/* typecheck */ \
			for_each_sta_info_type_check(local, (_addr), _sta, nxt),\
			/* continue condition */ \
			_sta; \
			/* advance loop */ \
			_sta = nxt, \
			nxt = _sta ? rcu_dereference(_sta->hnext) : NULL \
			) \
			/* run code only if address matches and it's not a dummy sta */ \
			if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0 && \
			!_sta->dummy)

			#define for_each_sta_info_rx(local, _addr, _sta, nxt) \
	for ( /* initialise loop */ \		for ( /* initialise loop */ \
	_sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\		_sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\
	nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \		nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \
	@@ -484,6 +511,7 @@ struct sta_info sta_info_alloc(struct ieee80211_sub_if_data sdata,
	int sta_info_insert(struct sta_info *sta);		int sta_info_insert(struct sta_info *sta);
	int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU);		int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU);
	int sta_info_insert_atomic(struct sta_info *sta);		int sta_info_insert_atomic(struct sta_info *sta);
			int sta_info_reinsert(struct sta_info *sta);

	int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata,		int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata,
	const u8 *addr);		const u8 *addr);

Admin message