cfg80211: stop tracking authenticated state (95de817b) · Commits · 戴 / test

Documentation/DocBook/80211.tmpl

+0 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@
		!Finclude/net/cfg80211.h cfg80211_pmksa
		!Finclude/net/cfg80211.h cfg80211_send_rx_auth
		!Finclude/net/cfg80211.h cfg80211_send_auth_timeout
		!Finclude/net/cfg80211.h __cfg80211_auth_canceled
		!Finclude/net/cfg80211.h cfg80211_send_rx_assoc
		!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout
		!Finclude/net/cfg80211.h cfg80211_send_deauth

include/net/cfg80211.h

+11 −28

Original line number	Diff line number	Diff line
		@@ -1039,10 +1039,6 @@ const u8 ieee80211_bss_get_ie(struct cfg80211_bss bss, u8 ie);
		* @key_len: length of WEP key for shared key authentication
		* @key_idx: index of WEP key for shared key authentication
		* @key: WEP key for shared key authentication
		* @local_state_change: This is a request for a local state only, i.e., no
		* Authentication frame is to be transmitted and authentication state is
		* to be changed without having to wait for a response from the peer STA
		* (AP).
		*/
		struct cfg80211_auth_request {
		struct cfg80211_bss *bss;
		@@ -1051,7 +1047,6 @@ struct cfg80211_auth_request {
		enum nl80211_auth_type auth_type;
		const u8 *key;
		u8 key_len, key_idx;
		bool local_state_change;
		};

		/**
		@@ -1068,7 +1063,11 @@ enum cfg80211_assoc_req_flags {
		*
		* This structure provides information needed to complete IEEE 802.11
		* (re)association.
		* @bss: The BSS to associate with.
		* @bss: The BSS to associate with. If the call is successful the driver
		* is given a reference that it must release, normally via a call to
		* cfg80211_send_rx_assoc(), or, if association timed out, with a
		* call to cfg80211_put_bss() (in addition to calling
		* cfg80211_send_assoc_timeout())
		* @ie: Extra IEs to add to (Re)Association Request frame or %NULL
		* @ie_len: Length of ie buffer in octets
		* @use_mfp: Use management frame protection (IEEE 802.11w) in this association
		@@ -1096,19 +1095,16 @@ struct cfg80211_assoc_request {
		* This structure provides information needed to complete IEEE 802.11
		* deauthentication.
		*
		* @bss: the BSS to deauthenticate from
		* @bssid: the BSSID of the BSS to deauthenticate from
		* @ie: Extra IEs to add to Deauthentication frame or %NULL
		* @ie_len: Length of ie buffer in octets
		* @reason_code: The reason code for the deauthentication
		* @local_state_change: This is a request for a local state only, i.e., no
		* Deauthentication frame is to be transmitted.
		*/
		struct cfg80211_deauth_request {
		struct cfg80211_bss *bss;
		const u8 *bssid;
		const u8 *ie;
		size_t ie_len;
		u16 reason_code;
		bool local_state_change;
		};

		/**
		@@ -2206,8 +2202,6 @@ struct cfg80211_conn;
		struct cfg80211_internal_bss;
		struct cfg80211_cached_keys;

		#define MAX_AUTH_BSSES 4

		/**
		* struct wireless_dev - wireless per-netdev state
		*
		@@ -2271,8 +2265,6 @@ struct wireless_dev {
		struct list_head event_list;
		spinlock_t event_lock;

		struct cfg80211_internal_bss *authtry_bsses[MAX_AUTH_BSSES];
		struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES];
		struct cfg80211_internal_bss current_bss; / associated / joined */
		struct ieee80211_channel *channel;

		@@ -2763,21 +2755,11 @@ void cfg80211_send_rx_auth(struct net_device dev, const u8 buf, size_t len);
		*/
		void cfg80211_send_auth_timeout(struct net_device dev, const u8 addr);

		/**
		* __cfg80211_auth_canceled - notify cfg80211 that authentication was canceled
		* @dev: network device
		* @addr: The MAC address of the device with which the authentication timed out
		*
		* When a pending authentication had no action yet, the driver may decide
		* to not send a deauth frame, but in that case must calls this function
		* to tell cfg80211 about this decision. It is only valid to call this
		* function within the deauth() callback.
		*/
		void __cfg80211_auth_canceled(struct net_device dev, const u8 addr);

		/**
		* cfg80211_send_rx_assoc - notification of processed association
		* @dev: network device
		* @bss: the BSS struct association was requested for, the struct reference
		* is owned by cfg80211 after this call
		* @buf: (re)association response frame (header + body)
		* @len: length of the frame data
		*
		@@ -2786,7 +2768,8 @@ void __cfg80211_auth_canceled(struct net_device dev, const u8 addr);
		* function or cfg80211_send_assoc_timeout() to indicate the result of
		* cfg80211_ops::assoc() call. This function may sleep.
		*/
		void cfg80211_send_rx_assoc(struct net_device dev, const u8 buf, size_t len);
		void cfg80211_send_rx_assoc(struct net_device dev, struct cfg80211_bss bss,
		const u8 *buf, size_t len);

		/**
		* cfg80211_send_assoc_timeout - notification of timed out association

net/mac80211/mlme.c

+8 −15

Original line number	Diff line number	Diff line
		@@ -2459,9 +2459,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
		struct ieee80211_work *wk;
		u16 auth_alg;

		if (req->local_state_change)
		return 0; /* no need to update mac80211 state */

		switch (req->auth_type) {
		case NL80211_AUTHTYPE_OPEN_SYSTEM:
		auth_alg = WLAN_AUTH_OPEN;
		@@ -2593,7 +2590,7 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
		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, cbss, skb->data, skb->len);
		destroy:
		if (wk->assoc.synced)
		drv_finish_tx_sync(local, wk->sdata, wk->filter_ta,
		@@ -2750,13 +2747,12 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
		{
		struct ieee80211_local *local = sdata->local;
		struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
		u8 bssid[ETH_ALEN];
		bool assoc_bss = false;

		mutex_lock(&ifmgd->mtx);

		memcpy(bssid, req->bss->bssid, ETH_ALEN);
		if (ifmgd->associated == req->bss) {
		if (ifmgd->associated &&
		memcmp(ifmgd->associated->bssid, req->bssid, ETH_ALEN) == 0) {
		ieee80211_set_disassoc(sdata, false, true);
		mutex_unlock(&ifmgd->mtx);
		assoc_bss = true;
		@@ -2777,7 +2773,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
		tmp->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
		continue;

		if (memcmp(req->bss->bssid, tmp->filter_ta, ETH_ALEN))
		if (memcmp(req->bssid, tmp->filter_ta, ETH_ALEN))
		continue;

		not_auth_yet = tmp->type == IEEE80211_WORK_DIRECT_PROBE;
		@@ -2811,18 +2807,15 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
		* frame, and if it's IDLE we have completed the auth
		* process already.
		*/
		if (not_auth_yet) {
		__cfg80211_auth_canceled(sdata->dev, bssid);
		if (not_auth_yet)
		return 0;
		}
		}

		printk(KERN_DEBUG "%s: deauthenticating from %pM by local choice (reason=%d)\n",
		sdata->name, bssid, req->reason_code);
		sdata->name, req->bssid, req->reason_code);

		ieee80211_send_deauth_disassoc(sdata, bssid, IEEE80211_STYPE_DEAUTH,
		req->reason_code, cookie,
		!req->local_state_change);
		ieee80211_send_deauth_disassoc(sdata, req->bssid, IEEE80211_STYPE_DEAUTH,
		req->reason_code, cookie, true);
		if (assoc_bss)
		sta_info_flush(sdata->local, sdata);

net/wireless/core.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -325,15 +325,13 @@ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		const u8 *bssid,
		const u8 *ssid, int ssid_len,
		const u8 *ie, int ie_len,
		const u8 *key, int key_len, int key_idx,
		bool local_state_change);
		const u8 *key, int key_len, int key_idx);
		int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		struct net_device dev, struct ieee80211_channel chan,
		enum nl80211_auth_type auth_type, const u8 *bssid,
		const u8 *ssid, int ssid_len,
		const u8 *ie, int ie_len,
		const u8 *key, int key_len, int key_idx,
		bool local_state_change);
		const u8 *key, int key_len, int key_idx);
		int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
		struct net_device *dev,
		struct ieee80211_channel *chan,
		@@ -421,7 +419,8 @@ void __cfg80211_disconnected(struct net_device dev, const u8 ie,
		size_t ie_len, u16 reason, bool from_ap);
		void cfg80211_sme_scan_done(struct net_device *dev);
		void cfg80211_sme_rx_auth(struct net_device dev, const u8 buf, size_t len);
		void cfg80211_sme_disassoc(struct net_device *dev, int idx);
		void cfg80211_sme_disassoc(struct net_device *dev,
		struct cfg80211_internal_bss *bss);
		void __cfg80211_scan_done(struct work_struct *wk);
		void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak);
		void __cfg80211_sched_scan_results(struct work_struct *wk);

net/wireless/mlme.c

+53 −269

Original line number	Diff line number	Diff line
		@@ -20,40 +20,18 @@ void cfg80211_send_rx_auth(struct net_device dev, const u8 buf, size_t len)
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct wiphy *wiphy = wdev->wiphy;
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		struct ieee80211_mgmt mgmt = (struct ieee80211_mgmt )buf;
		u8 *bssid = mgmt->bssid;
		int i;
		u16 status = le16_to_cpu(mgmt->u.auth.status_code);
		bool done = false;

		wdev_lock(wdev);

		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->authtry_bsses[i] &&
		memcmp(wdev->authtry_bsses[i]->pub.bssid, bssid,
		ETH_ALEN) == 0) {
		if (status == WLAN_STATUS_SUCCESS) {
		wdev->auth_bsses[i] = wdev->authtry_bsses[i];
		} else {
		cfg80211_unhold_bss(wdev->authtry_bsses[i]);
		cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
		}
		wdev->authtry_bsses[i] = NULL;
		done = true;
		break;
		}
		}

		if (done) {
		nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
		cfg80211_sme_rx_auth(dev, buf, len);
		}

		wdev_unlock(wdev);
		}
		EXPORT_SYMBOL(cfg80211_send_rx_auth);

		void cfg80211_send_rx_assoc(struct net_device dev, const u8 buf, size_t len)
		void cfg80211_send_rx_assoc(struct net_device dev, struct cfg80211_bss bss,
		const u8 *buf, size_t len)
		{
		u16 status_code;
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		@@ -61,8 +39,7 @@ void cfg80211_send_rx_assoc(struct net_device dev, const u8 buf, size_t len)
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		struct ieee80211_mgmt mgmt = (struct ieee80211_mgmt )buf;
		u8 *ie = mgmt->u.assoc_resp.variable;
		int i, ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable);
		struct cfg80211_internal_bss *bss = NULL;
		int ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable);

		wdev_lock(wdev);

		@@ -75,43 +52,20 @@ void cfg80211_send_rx_assoc(struct net_device dev, const u8 buf, size_t len)
		* frame instead of reassoc.
		*/
		if (status_code != WLAN_STATUS_SUCCESS && wdev->conn &&
		cfg80211_sme_failed_reassoc(wdev))
		cfg80211_sme_failed_reassoc(wdev)) {
		cfg80211_put_bss(bss);
		goto out;
		}

		nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL);

		if (status_code == WLAN_STATUS_SUCCESS) {
		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (!wdev->auth_bsses[i])
		continue;
		if (memcmp(wdev->auth_bsses[i]->pub.bssid, mgmt->bssid,
		ETH_ALEN) == 0) {
		bss = wdev->auth_bsses[i];
		wdev->auth_bsses[i] = NULL;
		/* additional reference to drop hold */
		cfg80211_ref_bss(bss);
		break;
		}
		}

		/*
		* We might be coming here because the driver reported
		* a successful association at the same time as the
		* user requested a deauth. In that case, we will have
		* removed the BSS from the auth_bsses list due to the
		* deauth request when the assoc response makes it. If
		* the two code paths acquire the lock the other way
		* around, that's just the standard situation of a
		* deauth being requested while connected.
		*/
		if (!bss)
		goto out;
		} else if (wdev->conn) {
		if (status_code != WLAN_STATUS_SUCCESS && wdev->conn) {
		cfg80211_sme_failed_assoc(wdev);
		/*
		* do not call connect_result() now because the
		* sme will schedule work that does it later.
		*/
		cfg80211_put_bss(bss);
		goto out;
		}

		@@ -124,17 +78,10 @@ void cfg80211_send_rx_assoc(struct net_device dev, const u8 buf, size_t len)
		wdev->sme_state = CFG80211_SME_CONNECTING;
		}

		/* this consumes one bss reference (unless bss is NULL) */
		/* this consumes the bss reference */
		__cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs,
		status_code,
		status_code == WLAN_STATUS_SUCCESS,
		bss ? &bss->pub : NULL);
		/* drop hold now, and also reference acquired above */
		if (bss) {
		cfg80211_unhold_bss(bss);
		cfg80211_put_bss(&bss->pub);
		}

		status_code == WLAN_STATUS_SUCCESS, bss);
		out:
		wdev_unlock(wdev);
		}
		@@ -148,8 +95,7 @@ void __cfg80211_send_deauth(struct net_device *dev,
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		struct ieee80211_mgmt mgmt = (struct ieee80211_mgmt )buf;
		const u8 *bssid = mgmt->bssid;
		int i;
		bool found = false, was_current = false;
		bool was_current = false;

		ASSERT_WDEV_LOCK(wdev);

		@@ -158,31 +104,8 @@ void __cfg80211_send_deauth(struct net_device *dev,
		cfg80211_unhold_bss(wdev->current_bss);
		cfg80211_put_bss(&wdev->current_bss->pub);
		wdev->current_bss = NULL;
		found = true;
		was_current = true;
		} else for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->auth_bsses[i] &&
		memcmp(wdev->auth_bsses[i]->pub.bssid, bssid, ETH_ALEN) == 0) {
		cfg80211_unhold_bss(wdev->auth_bsses[i]);
		cfg80211_put_bss(&wdev->auth_bsses[i]->pub);
		wdev->auth_bsses[i] = NULL;
		found = true;
		break;
		}
		if (wdev->authtry_bsses[i] &&
		memcmp(wdev->authtry_bsses[i]->pub.bssid, bssid,
		ETH_ALEN) == 0 &&
		memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) == 0) {
		cfg80211_unhold_bss(wdev->authtry_bsses[i]);
		cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
		wdev->authtry_bsses[i] = NULL;
		found = true;
		break;
		}
		}

		if (!found)
		return;

		nl80211_send_deauth(rdev, dev, buf, len, GFP_KERNEL);

		@@ -220,10 +143,8 @@ void __cfg80211_send_disassoc(struct net_device *dev,
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		struct ieee80211_mgmt mgmt = (struct ieee80211_mgmt )buf;
		const u8 *bssid = mgmt->bssid;
		int i;
		u16 reason_code;
		bool from_ap;
		bool done = false;

		ASSERT_WDEV_LOCK(wdev);

		@@ -234,16 +155,10 @@ void __cfg80211_send_disassoc(struct net_device *dev,

		if (wdev->current_bss &&
		memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->authtry_bsses[i] \|\| wdev->auth_bsses[i])
		continue;
		wdev->auth_bsses[i] = wdev->current_bss;
		cfg80211_sme_disassoc(dev, wdev->current_bss);
		cfg80211_unhold_bss(wdev->current_bss);
		cfg80211_put_bss(&wdev->current_bss->pub);
		wdev->current_bss = NULL;
		done = true;
		cfg80211_sme_disassoc(dev, i);
		break;
		}
		WARN_ON(!done);
		} else
		WARN_ON(1);

		@@ -287,34 +202,6 @@ void cfg80211_send_unprot_disassoc(struct net_device dev, const u8 buf,
		}
		EXPORT_SYMBOL(cfg80211_send_unprot_disassoc);

		static void __cfg80211_auth_remove(struct wireless_dev wdev, const u8 addr)
		{
		int i;
		bool done = false;

		ASSERT_WDEV_LOCK(wdev);

		for (i = 0; addr && i < MAX_AUTH_BSSES; i++) {
		if (wdev->authtry_bsses[i] &&
		memcmp(wdev->authtry_bsses[i]->pub.bssid,
		addr, ETH_ALEN) == 0) {
		cfg80211_unhold_bss(wdev->authtry_bsses[i]);
		cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
		wdev->authtry_bsses[i] = NULL;
		done = true;
		break;
		}
		}

		WARN_ON(!done);
		}

		void __cfg80211_auth_canceled(struct net_device dev, const u8 addr)
		{
		__cfg80211_auth_remove(dev->ieee80211_ptr, addr);
		}
		EXPORT_SYMBOL(__cfg80211_auth_canceled);

		void cfg80211_send_auth_timeout(struct net_device dev, const u8 addr)
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		@@ -329,8 +216,6 @@ void cfg80211_send_auth_timeout(struct net_device dev, const u8 addr)
		WLAN_STATUS_UNSPECIFIED_FAILURE,
		false, NULL);

		__cfg80211_auth_remove(wdev, addr);

		wdev_unlock(wdev);
		}
		EXPORT_SYMBOL(cfg80211_send_auth_timeout);
		@@ -340,8 +225,6 @@ void cfg80211_send_assoc_timeout(struct net_device dev, const u8 addr)
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct wiphy *wiphy = wdev->wiphy;
		struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
		int i;
		bool done = false;

		wdev_lock(wdev);

		@@ -351,20 +234,6 @@ void cfg80211_send_assoc_timeout(struct net_device dev, const u8 addr)
		WLAN_STATUS_UNSPECIFIED_FAILURE,
		false, NULL);

		for (i = 0; addr && i < MAX_AUTH_BSSES; i++) {
		if (wdev->auth_bsses[i] &&
		memcmp(wdev->auth_bsses[i]->pub.bssid,
		addr, ETH_ALEN) == 0) {
		cfg80211_unhold_bss(wdev->auth_bsses[i]);
		cfg80211_put_bss(&wdev->auth_bsses[i]->pub);
		wdev->auth_bsses[i] = NULL;
		done = true;
		break;
		}
		}

		WARN_ON(!done);

		wdev_unlock(wdev);
		}
		EXPORT_SYMBOL(cfg80211_send_assoc_timeout);
		@@ -403,13 +272,11 @@ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		const u8 *bssid,
		const u8 *ssid, int ssid_len,
		const u8 *ie, int ie_len,
		const u8 *key, int key_len, int key_idx,
		bool local_state_change)
		const u8 *key, int key_len, int key_idx)
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct cfg80211_auth_request req;
		struct cfg80211_internal_bss *bss;
		int i, err, slot = -1, nfree = 0;
		int err;

		ASSERT_WDEV_LOCK(wdev);

		@@ -421,20 +288,8 @@ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		memcmp(bssid, wdev->current_bss->pub.bssid, ETH_ALEN) == 0)
		return -EALREADY;

		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->authtry_bsses[i] &&
		memcmp(bssid, wdev->authtry_bsses[i]->pub.bssid,
		ETH_ALEN) == 0)
		return -EALREADY;
		if (wdev->auth_bsses[i] &&
		memcmp(bssid, wdev->auth_bsses[i]->pub.bssid,
		ETH_ALEN) == 0)
		return -EALREADY;
		}

		memset(&req, 0, sizeof(req));

		req.local_state_change = local_state_change;
		req.ie = ie;
		req.ie_len = ie_len;
		req.auth_type = auth_type;
		@@ -446,38 +301,8 @@ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		if (!req.bss)
		return -ENOENT;

		bss = bss_from_pub(req.bss);

		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (!wdev->auth_bsses[i] && !wdev->authtry_bsses[i]) {
		slot = i;
		nfree++;
		}
		}

		/* we need one free slot for disassoc and one for this auth */
		if (nfree < 2) {
		err = -ENOSPC;
		goto out;
		}

		if (local_state_change)
		wdev->auth_bsses[slot] = bss;
		else
		wdev->authtry_bsses[slot] = bss;
		cfg80211_hold_bss(bss);

		err = rdev->ops->auth(&rdev->wiphy, dev, &req);
		if (err) {
		if (local_state_change)
		wdev->auth_bsses[slot] = NULL;
		else
		wdev->authtry_bsses[slot] = NULL;
		cfg80211_unhold_bss(bss);
		}

		out:
		if (err)
		cfg80211_put_bss(req.bss);
		return err;
		}
		@@ -487,15 +312,14 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
		enum nl80211_auth_type auth_type, const u8 *bssid,
		const u8 *ssid, int ssid_len,
		const u8 *ie, int ie_len,
		const u8 *key, int key_len, int key_idx,
		bool local_state_change)
		const u8 *key, int key_len, int key_idx)
		{
		int err;

		wdev_lock(dev->ieee80211_ptr);
		err = __cfg80211_mlme_auth(rdev, dev, chan, auth_type, bssid,
		ssid, ssid_len, ie, ie_len,
		key, key_len, key_idx, local_state_change);
		key, key_len, key_idx);
		wdev_unlock(dev->ieee80211_ptr);

		return err;
		@@ -530,8 +354,7 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct cfg80211_assoc_request req;
		struct cfg80211_internal_bss *bss;
		int i, err, slot = -1;
		int err;
		bool was_connected = false;

		ASSERT_WDEV_LOCK(wdev);
		@@ -573,26 +396,14 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
		return -ENOENT;
		}

		bss = bss_from_pub(req.bss);

		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (bss == wdev->auth_bsses[i]) {
		slot = i;
		break;
		}
		}

		if (slot < 0) {
		err = -ENOTCONN;
		goto out;
		}

		err = rdev->ops->assoc(&rdev->wiphy, dev, &req);
		out:
		if (err && was_connected)

		if (err) {
		if (was_connected)
		wdev->sme_state = CFG80211_SME_CONNECTED;
		/* still a reference in wdev->auth_bsses[slot] */
		cfg80211_put_bss(req.bss);
		}

		return err;
		}

		@@ -624,34 +435,25 @@ int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev,
		bool local_state_change)
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct cfg80211_deauth_request req;
		int i;
		struct cfg80211_deauth_request req = {
		.bssid = bssid,
		.reason_code = reason,
		.ie = ie,
		.ie_len = ie_len,
		};

		ASSERT_WDEV_LOCK(wdev);

		memset(&req, 0, sizeof(req));
		req.reason_code = reason;
		req.local_state_change = local_state_change;
		req.ie = ie;
		req.ie_len = ie_len;
		if (local_state_change) {
		if (wdev->current_bss &&
		memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
		req.bss = &wdev->current_bss->pub;
		} else for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->auth_bsses[i] &&
		memcmp(bssid, wdev->auth_bsses[i]->pub.bssid, ETH_ALEN) == 0) {
		req.bss = &wdev->auth_bsses[i]->pub;
		break;
		}
		if (wdev->authtry_bsses[i] &&
		memcmp(bssid, wdev->authtry_bsses[i]->pub.bssid, ETH_ALEN) == 0) {
		req.bss = &wdev->authtry_bsses[i]->pub;
		break;
		}
		cfg80211_unhold_bss(wdev->current_bss);
		cfg80211_put_bss(&wdev->current_bss->pub);
		wdev->current_bss = NULL;
		}

		if (!req.bss)
		return -ENOTCONN;
		return 0;
		}

		return rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev);
		}
		@@ -722,7 +524,7 @@ void cfg80211_mlme_down(struct cfg80211_registered_device *rdev,
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		struct cfg80211_deauth_request req;
		int i;
		u8 bssid[ETH_ALEN];

		ASSERT_WDEV_LOCK(wdev);

		@@ -734,9 +536,13 @@ void cfg80211_mlme_down(struct cfg80211_registered_device *rdev,
		req.ie = NULL;
		req.ie_len = 0;

		if (wdev->current_bss) {
		req.bss = &wdev->current_bss->pub;
		if (!wdev->current_bss)
		return;

		memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN);
		req.bssid = bssid;
		rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev);

		if (wdev->current_bss) {
		cfg80211_unhold_bss(wdev->current_bss);
		cfg80211_put_bss(&wdev->current_bss->pub);
		@@ -744,28 +550,6 @@ void cfg80211_mlme_down(struct cfg80211_registered_device *rdev,
		}
		}

		for (i = 0; i < MAX_AUTH_BSSES; i++) {
		if (wdev->auth_bsses[i]) {
		req.bss = &wdev->auth_bsses[i]->pub;
		rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev);
		if (wdev->auth_bsses[i]) {
		cfg80211_unhold_bss(wdev->auth_bsses[i]);
		cfg80211_put_bss(&wdev->auth_bsses[i]->pub);
		wdev->auth_bsses[i] = NULL;
		}
		}
		if (wdev->authtry_bsses[i]) {
		req.bss = &wdev->authtry_bsses[i]->pub;
		rdev->ops->deauth(&rdev->wiphy, dev, &req, wdev);
		if (wdev->authtry_bsses[i]) {
		cfg80211_unhold_bss(wdev->authtry_bsses[i]);
		cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
		wdev->authtry_bsses[i] = NULL;
		}
		}
		}
		}

		void cfg80211_ready_on_channel(struct net_device *dev, u64 cookie,
		struct ieee80211_channel *chan,
		enum nl80211_channel_type channel_type,

Admin message