Commit 3bb02143 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: support immediate reconnect request hint 



There are cases where it's necessary to disconnect, but an
immediate reconnection is desired. Support a hint to userspace
that this is the case, by including a new attribute in the
deauth or disassoc event.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201206145305.58d33941fb9d.I0e7168c205c7949529c8e3b86f3c9b12c01a7017@changeid


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

include/net/cfg80211.h

+3 −1
Original line number Diff line number Diff line
@@ -6406,13 +6406,15 @@ void cfg80211_abandon_assoc(struct net_device *dev, struct cfg80211_bss *bss); 
 * @dev: network device

 * @buf: 802.11 frame (header + body)

 * @len: length of the frame data

 * @reconnect: immediate reconnect is desired (include the nl80211 attribute)

 *

 * This function is called whenever deauthentication has been processed in

 * station mode. This includes both received deauthentication frames and

 * locally generated ones. This function may sleep. The caller must hold the

 * corresponding wdev's mutex.

 */

void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len,

			   bool reconnect);



/**

 * cfg80211_rx_unprot_mlme_mgmt - notification of unprotected mlme mgmt frame

include/uapi/linux/nl80211.h

+6 −0
Original line number Diff line number Diff line
@@ -2535,6 +2535,10 @@ enum nl80211_commands { 
 *	This is a u8 attribute that encapsulates one of the values from

 *	&enum nl80211_sae_pwe_mechanism.

 *

 * @NL80211_ATTR_RECONNECT_REQUESTED: flag attribute, used with deauth and

 *	disassoc events to indicate that an immediate reconnect to the AP

 *	is desired.

 *

 * @NUM_NL80211_ATTR: total number of nl80211_attrs available

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3026,6 +3030,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_SAE_PWE,



	NL80211_ATTR_RECONNECT_REQUESTED,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,

net/mac80211/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -2741,7 +2741,7 @@ static void ieee80211_report_disconnect(struct ieee80211_sub_if_data *sdata, 
	};



	if (tx)

		cfg80211_tx_mlme_mgmt(sdata->dev, buf, len);

		cfg80211_tx_mlme_mgmt(sdata->dev, buf, len, false);

	else

		cfg80211_rx_mlme_mgmt(sdata->dev, buf, len);
@@ -4721,7 +4721,8 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata) 
		if (ifmgd->auth_data)

			ieee80211_destroy_auth_data(sdata, false);

		cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,

				      IEEE80211_DEAUTH_FRAME_LEN);

				      IEEE80211_DEAUTH_FRAME_LEN,

				      false);

	}



	/* This is a bit of a hack - we should find a better and more generic

net/wireless/mlme.c

+15 −11
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *

 * Copyright (c) 2009, Jouni Malinen <j@w1.fi>

 * Copyright (c) 2015		Intel Deutschland GmbH

 * Copyright (C) 2019 Intel Corporation

 * Copyright (C) 2019-2020 Intel Corporation

 */



#include <linux/kernel.h>
@@ -81,7 +81,8 @@ static void cfg80211_process_auth(struct wireless_dev *wdev, 
}



static void cfg80211_process_deauth(struct wireless_dev *wdev,

				    const u8 *buf, size_t len)

				    const u8 *buf, size_t len,

				    bool reconnect)

{

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);

	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
@@ -89,7 +90,7 @@ static void cfg80211_process_deauth(struct wireless_dev *wdev, 
	u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);

	bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);



	nl80211_send_deauth(rdev, wdev->netdev, buf, len, GFP_KERNEL);

	nl80211_send_deauth(rdev, wdev->netdev, buf, len, reconnect, GFP_KERNEL);



	if (!wdev->current_bss ||

	    !ether_addr_equal(wdev->current_bss->pub.bssid, bssid))
@@ -100,7 +101,8 @@ static void cfg80211_process_deauth(struct wireless_dev *wdev, 
}



static void cfg80211_process_disassoc(struct wireless_dev *wdev,

				      const u8 *buf, size_t len)

				      const u8 *buf, size_t len,

				      bool reconnect)

{

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);

	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
@@ -108,7 +110,8 @@ static void cfg80211_process_disassoc(struct wireless_dev *wdev, 
	u16 reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);

	bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);



	nl80211_send_disassoc(rdev, wdev->netdev, buf, len, GFP_KERNEL);

	nl80211_send_disassoc(rdev, wdev->netdev, buf, len, reconnect,

			      GFP_KERNEL);



	if (WARN_ON(!wdev->current_bss ||

		    !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))
@@ -133,9 +136,9 @@ void cfg80211_rx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len) 
	if (ieee80211_is_auth(mgmt->frame_control))

		cfg80211_process_auth(wdev, buf, len);

	else if (ieee80211_is_deauth(mgmt->frame_control))

		cfg80211_process_deauth(wdev, buf, len);

		cfg80211_process_deauth(wdev, buf, len, false);

	else if (ieee80211_is_disassoc(mgmt->frame_control))

		cfg80211_process_disassoc(wdev, buf, len);

		cfg80211_process_disassoc(wdev, buf, len, false);

}

EXPORT_SYMBOL(cfg80211_rx_mlme_mgmt);
@@ -180,22 +183,23 @@ void cfg80211_abandon_assoc(struct net_device *dev, struct cfg80211_bss *bss) 
}

EXPORT_SYMBOL(cfg80211_abandon_assoc);



void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len)

void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len,

			   bool reconnect)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct ieee80211_mgmt *mgmt = (void *)buf;



	ASSERT_WDEV_LOCK(wdev);



	trace_cfg80211_tx_mlme_mgmt(dev, buf, len);

	trace_cfg80211_tx_mlme_mgmt(dev, buf, len, reconnect);



	if (WARN_ON(len < 2))

		return;



	if (ieee80211_is_deauth(mgmt->frame_control))

		cfg80211_process_deauth(wdev, buf, len);

		cfg80211_process_deauth(wdev, buf, len, reconnect);

	else

		cfg80211_process_disassoc(wdev, buf, len);

		cfg80211_process_disassoc(wdev, buf, len, reconnect);

}

EXPORT_SYMBOL(cfg80211_tx_mlme_mgmt);

net/wireless/nl80211.c

+15 −8
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_SAE_PWE] =

		NLA_POLICY_RANGE(NLA_U8, NL80211_SAE_PWE_HUNT_AND_PECK,

				 NL80211_SAE_PWE_BOTH),

	[NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },

};



/* policy for the key attributes */
@@ -15855,7 +15856,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, 
				    const u8 *buf, size_t len,

				    enum nl80211_commands cmd, gfp_t gfp,

				    int uapsd_queues, const u8 *req_ies,

				    size_t req_ies_len)

				    size_t req_ies_len, bool reconnect)

{

	struct sk_buff *msg;

	void *hdr;
@@ -15877,6 +15878,9 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, 
	     nla_put(msg, NL80211_ATTR_REQ_IE, req_ies_len, req_ies)))

		goto nla_put_failure;



	if (reconnect && nla_put_flag(msg, NL80211_ATTR_RECONNECT_REQUESTED))

		goto nla_put_failure;



	if (uapsd_queues >= 0) {

		struct nlattr *nla_wmm =

			nla_nest_start_noflag(msg, NL80211_ATTR_STA_WME);
@@ -15905,7 +15909,8 @@ void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev, 
			  size_t len, gfp_t gfp)

{

	nl80211_send_mlme_event(rdev, netdev, buf, len,

				NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0);

				NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0,

				false);

}



void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
@@ -15915,23 +15920,25 @@ void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev, 
{

	nl80211_send_mlme_event(rdev, netdev, buf, len,

				NL80211_CMD_ASSOCIATE, gfp, uapsd_queues,

				req_ies, req_ies_len);

				req_ies, req_ies_len, false);

}



void nl80211_send_deauth(struct cfg80211_registered_device *rdev,

			 struct net_device *netdev, const u8 *buf,

			 size_t len, gfp_t gfp)

			 size_t len, bool reconnect, gfp_t gfp)

{

	nl80211_send_mlme_event(rdev, netdev, buf, len,

				NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0);

				NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0,

				reconnect);

}



void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,

			   struct net_device *netdev, const u8 *buf,

			   size_t len, gfp_t gfp)

			   size_t len, bool reconnect, gfp_t gfp)

{

	nl80211_send_mlme_event(rdev, netdev, buf, len,

				NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0);

				NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0,

				reconnect);

}



void cfg80211_rx_unprot_mlme_mgmt(struct net_device *dev, const u8 *buf,
@@ -15962,7 +15969,7 @@ void cfg80211_rx_unprot_mlme_mgmt(struct net_device *dev, const u8 *buf, 


	trace_cfg80211_rx_unprot_mlme_mgmt(dev, buf, len);

	nl80211_send_mlme_event(rdev, dev, buf, len, cmd, GFP_ATOMIC, -1,

				NULL, 0);

				NULL, 0, false);

}

EXPORT_SYMBOL(cfg80211_rx_unprot_mlme_mgmt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE