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

Commit 7e06ce34 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211: Allow cfg80211_connect_result() errors to be distinguished"

parents 0421c8c1 a19ed7f2

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
!Finclude/net/cfg80211.h cfg80211_ibss_joined

!Finclude/net/cfg80211.h cfg80211_connect_result

!Finclude/net/cfg80211.h cfg80211_connect_bss

!Finclude/net/cfg80211.h cfg80211_connect_timeout

!Finclude/net/cfg80211.h cfg80211_roamed

!Finclude/net/cfg80211.h cfg80211_disconnected

!Finclude/net/cfg80211.h cfg80211_ready_on_channel

include/net/cfg80211.h

+41 −4
Original line number Diff line number Diff line
@@ -2258,9 +2258,23 @@ struct cfg80211_qos_map { 
 *	(invoked with the wireless_dev mutex held)

 *

 * @connect: Connect to the ESS with the specified parameters. When connected,

 *	call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS.

 *	If the connection fails for some reason, call cfg80211_connect_result()

 *	with the status from the AP.

 *	call cfg80211_connect_result()/cfg80211_connect_bss() with status code

 *	%WLAN_STATUS_SUCCESS. If the connection fails for some reason, call

 *	cfg80211_connect_result()/cfg80211_connect_bss() with the status code

 *	from the AP or cfg80211_connect_timeout() if no frame with status code

 *	was received.

 *	The driver is allowed to roam to other BSSes within the ESS when the

 *	other BSS matches the connect parameters. When such roaming is initiated

 *	by the driver, the driver is expected to verify that the target matches

 *	the configured security parameters and to use Reassociation Request

 *	frame instead of Association Request frame.

 *	The connect function can also be used to request the driver to perform a

 *	specific roam when connected to an ESS. In that case, the prev_bssid

 *	parameter is set to the BSSID of the currently associated BSS as an

 *	indication of requesting reassociation.

 *	In both the driver-initiated and new connect() call initiated roaming

 *	cases, the result of roaming is indicated with a call to

 *	cfg80211_roamed() or cfg80211_roamed_bss().

 *	(invoked with the wireless_dev mutex held)

 * @disconnect: Disconnect from the BSS/ESS.

 *	(invoked with the wireless_dev mutex held)
@@ -4464,7 +4478,7 @@ static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp) 
void cfg80211_connect_bss(struct net_device *dev, const u8 *bssid,

			  struct cfg80211_bss *bss, const u8 *req_ie,

			  size_t req_ie_len, const u8 *resp_ie,

			  size_t resp_ie_len, u16 status, gfp_t gfp);

			  size_t resp_ie_len, int status, gfp_t gfp);



/**

 * cfg80211_connect_result - notify cfg80211 of connection result
@@ -4493,6 +4507,29 @@ cfg80211_connect_result(struct net_device *dev, const u8 *bssid, 
			     resp_ie_len, status, gfp);

}



/**

 * cfg80211_connect_timeout - notify cfg80211 of connection timeout

 *

 * @dev: network device

 * @bssid: the BSSID of the AP

 * @req_ie: association request IEs (maybe be %NULL)

 * @req_ie_len: association request IEs length

 * @gfp: allocation flags

 *

 * It should be called by the underlying driver whenever connect() has failed

 * in a sequence where no explicit authentication/association rejection was

 * received from the AP. This could happen, e.g., due to not being able to send

 * out the Authentication or Association Request frame or timing out while

 * waiting for the response.

 */

static inline void

cfg80211_connect_timeout(struct net_device *dev, const u8 *bssid,

			 const u8 *req_ie, size_t req_ie_len, gfp_t gfp)

{

	cfg80211_connect_bss(dev, bssid, NULL, req_ie, req_ie_len, NULL, 0, -1,

			     gfp);

}



/**

 * cfg80211_roamed - notify cfg80211 of roaming

 *

include/uapi/linux/nl80211.h

+6 −1
Original line number Diff line number Diff line
@@ -444,7 +444,12 @@ 
 *	This attribute is ignored if driver does not support roam scan.

 *	It is also sent as an event, with the BSSID and response IEs when the

 *	connection is established or failed to be established. This can be

 *	determined by the STATUS_CODE attribute.

 *	determined by the %NL80211_ATTR_STATUS_CODE attribute (0 = success,

 *	non-zero = failure). If %NL80211_ATTR_TIMED_OUT is included in the

 *	event, the connection attempt failed due to not being able to initiate

 *	authentication/association or not receiving a response from the AP.

 *	Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as

 *	well to remain backwards compatible.

 * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),

 *	sent as an event when the card/driver roamed by itself.

 * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify

net/wireless/core.h

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct cfg80211_event { 
			size_t req_ie_len;

			size_t resp_ie_len;

			struct cfg80211_bss *bss;

			u16 status;

			int status; /* -1 = failed; 0..65535 = status code */

		} cr;

		struct {

			const u8 *req_ie;
@@ -349,7 +349,7 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, 
void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,

			       const u8 *req_ie, size_t req_ie_len,

			       const u8 *resp_ie, size_t resp_ie_len,

			       u16 status, bool wextev,

			       int status, bool wextev,

			       struct cfg80211_bss *bss);

void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,

			     size_t ie_len, u16 reason, bool from_ap);

net/wireless/nl80211.c

+5 −2
Original line number Diff line number Diff line
@@ -10852,7 +10852,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, 
				 struct net_device *netdev, const u8 *bssid,

				 const u8 *req_ie, size_t req_ie_len,

				 const u8 *resp_ie, size_t resp_ie_len,

				 u16 status, gfp_t gfp)

				 int status, gfp_t gfp)

{

	struct sk_buff *msg;

	void *hdr;
@@ -10870,7 +10870,10 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, 
	if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||

	    nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex) ||

	    (bssid && nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid)) ||

	    nla_put_u16(msg, NL80211_ATTR_STATUS_CODE, status) ||

	    nla_put_u16(msg, NL80211_ATTR_STATUS_CODE,

			status < 0 ? WLAN_STATUS_UNSPECIFIED_FAILURE :

			status) ||

	    (status < 0 && nla_put_flag(msg, NL80211_ATTR_TIMED_OUT)) ||

	    (req_ie &&

	     nla_put(msg, NL80211_ATTR_REQ_IE, req_ie_len, req_ie)) ||

	    (resp_ie &&