1 From: Johannes Berg <johannes.berg@intel.com>
2 Date: Sun, 6 Dec 2020 14:54:42 +0200
3 Subject: [PATCH] cfg80211: support immediate reconnect request hint
5 There are cases where it's necessary to disconnect, but an
6 immediate reconnection is desired. Support a hint to userspace
7 that this is the case, by including a new attribute in the
8 deauth or disassoc event.
10 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
11 Link: https://lore.kernel.org/r/iwlwifi.20201206145305.58d33941fb9d.I0e7168c205c7949529c8e3b86f3c9b12c01a7017@changeid
12 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
15 --- a/include/net/cfg80211.h
16 +++ b/include/net/cfg80211.h
17 @@ -6410,13 +6410,15 @@ void cfg80211_abandon_assoc(struct net_d
18 * @dev: network device
19 * @buf: 802.11 frame (header + body)
20 * @len: length of the frame data
21 + * @reconnect: immediate reconnect is desired (include the nl80211 attribute)
23 * This function is called whenever deauthentication has been processed in
24 * station mode. This includes both received deauthentication frames and
25 * locally generated ones. This function may sleep. The caller must hold the
26 * corresponding wdev's mutex.
28 -void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len);
29 +void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len,
33 * cfg80211_rx_unprot_mlme_mgmt - notification of unprotected mlme mgmt frame
34 --- a/include/uapi/linux/nl80211.h
35 +++ b/include/uapi/linux/nl80211.h
36 @@ -2527,6 +2527,10 @@ enum nl80211_commands {
37 * override mask. Used with NL80211_ATTR_S1G_CAPABILITY in
38 * NL80211_CMD_ASSOCIATE or NL80211_CMD_CONNECT.
40 + * @NL80211_ATTR_RECONNECT_REQUESTED: flag attribute, used with deauth and
41 + * disassoc events to indicate that an immediate reconnect to the AP
44 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
45 * @NL80211_ATTR_MAX: highest attribute number currently defined
46 * @__NL80211_ATTR_AFTER_LAST: internal use
47 @@ -3016,6 +3020,8 @@ enum nl80211_attrs {
48 NL80211_ATTR_S1G_CAPABILITY,
49 NL80211_ATTR_S1G_CAPABILITY_MASK,
51 + NL80211_ATTR_RECONNECT_REQUESTED,
53 /* add attributes here, update the policy in nl80211.c */
55 __NL80211_ATTR_AFTER_LAST,
56 --- a/net/mac80211/mlme.c
57 +++ b/net/mac80211/mlme.c
58 @@ -2729,7 +2729,7 @@ static void ieee80211_report_disconnect(
62 - cfg80211_tx_mlme_mgmt(sdata->dev, buf, len);
63 + cfg80211_tx_mlme_mgmt(sdata->dev, buf, len, false);
65 cfg80211_rx_mlme_mgmt(sdata->dev, buf, len);
67 @@ -4719,7 +4719,8 @@ void ieee80211_mgd_quiesce(struct ieee80
69 ieee80211_destroy_auth_data(sdata, false);
70 cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
71 - IEEE80211_DEAUTH_FRAME_LEN);
72 + IEEE80211_DEAUTH_FRAME_LEN,
76 /* This is a bit of a hack - we should find a better and more generic
77 --- a/net/wireless/mlme.c
78 +++ b/net/wireless/mlme.c
81 * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
82 * Copyright (c) 2015 Intel Deutschland GmbH
83 - * Copyright (C) 2019 Intel Corporation
84 + * Copyright (C) 2019-2020 Intel Corporation
87 #include <linux/kernel.h>
88 @@ -81,7 +81,8 @@ static void cfg80211_process_auth(struct
91 static void cfg80211_process_deauth(struct wireless_dev *wdev,
92 - const u8 *buf, size_t len)
93 + const u8 *buf, size_t len,
96 struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
97 struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
98 @@ -89,7 +90,7 @@ static void cfg80211_process_deauth(stru
99 u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
100 bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);
102 - nl80211_send_deauth(rdev, wdev->netdev, buf, len, GFP_KERNEL);
103 + nl80211_send_deauth(rdev, wdev->netdev, buf, len, reconnect, GFP_KERNEL);
105 if (!wdev->current_bss ||
106 !ether_addr_equal(wdev->current_bss->pub.bssid, bssid))
107 @@ -100,7 +101,8 @@ static void cfg80211_process_deauth(stru
110 static void cfg80211_process_disassoc(struct wireless_dev *wdev,
111 - const u8 *buf, size_t len)
112 + const u8 *buf, size_t len,
115 struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
116 struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
117 @@ -108,7 +110,8 @@ static void cfg80211_process_disassoc(st
118 u16 reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
119 bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);
121 - nl80211_send_disassoc(rdev, wdev->netdev, buf, len, GFP_KERNEL);
122 + nl80211_send_disassoc(rdev, wdev->netdev, buf, len, reconnect,
125 if (WARN_ON(!wdev->current_bss ||
126 !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))
127 @@ -133,9 +136,9 @@ void cfg80211_rx_mlme_mgmt(struct net_de
128 if (ieee80211_is_auth(mgmt->frame_control))
129 cfg80211_process_auth(wdev, buf, len);
130 else if (ieee80211_is_deauth(mgmt->frame_control))
131 - cfg80211_process_deauth(wdev, buf, len);
132 + cfg80211_process_deauth(wdev, buf, len, false);
133 else if (ieee80211_is_disassoc(mgmt->frame_control))
134 - cfg80211_process_disassoc(wdev, buf, len);
135 + cfg80211_process_disassoc(wdev, buf, len, false);
137 EXPORT_SYMBOL(cfg80211_rx_mlme_mgmt);
139 @@ -180,22 +183,23 @@ void cfg80211_abandon_assoc(struct net_d
141 EXPORT_SYMBOL(cfg80211_abandon_assoc);
143 -void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len)
144 +void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len,
147 struct wireless_dev *wdev = dev->ieee80211_ptr;
148 struct ieee80211_mgmt *mgmt = (void *)buf;
150 ASSERT_WDEV_LOCK(wdev);
152 - trace_cfg80211_tx_mlme_mgmt(dev, buf, len);
153 + trace_cfg80211_tx_mlme_mgmt(dev, buf, len, reconnect);
155 if (WARN_ON(len < 2))
158 if (ieee80211_is_deauth(mgmt->frame_control))
159 - cfg80211_process_deauth(wdev, buf, len);
160 + cfg80211_process_deauth(wdev, buf, len, reconnect);
162 - cfg80211_process_disassoc(wdev, buf, len);
163 + cfg80211_process_disassoc(wdev, buf, len, reconnect);
165 EXPORT_SYMBOL(cfg80211_tx_mlme_mgmt);
167 --- a/net/wireless/nl80211.c
168 +++ b/net/wireless/nl80211.c
169 @@ -736,6 +736,7 @@ static const struct nla_policy nl80211_p
170 NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
171 [NL80211_ATTR_S1G_CAPABILITY_MASK] =
172 NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
173 + [NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },
176 /* policy for the key attributes */
177 @@ -15903,7 +15904,7 @@ static void nl80211_send_mlme_event(stru
178 const u8 *buf, size_t len,
179 enum nl80211_commands cmd, gfp_t gfp,
180 int uapsd_queues, const u8 *req_ies,
181 - size_t req_ies_len)
182 + size_t req_ies_len, bool reconnect)
186 @@ -15925,6 +15926,9 @@ static void nl80211_send_mlme_event(stru
187 nla_put(msg, NL80211_ATTR_REQ_IE, req_ies_len, req_ies)))
188 goto nla_put_failure;
190 + if (reconnect && nla_put_flag(msg, NL80211_ATTR_RECONNECT_REQUESTED))
191 + goto nla_put_failure;
193 if (uapsd_queues >= 0) {
194 struct nlattr *nla_wmm =
195 nla_nest_start_noflag(msg, NL80211_ATTR_STA_WME);
196 @@ -15953,7 +15957,8 @@ void nl80211_send_rx_auth(struct cfg8021
197 size_t len, gfp_t gfp)
199 nl80211_send_mlme_event(rdev, netdev, buf, len,
200 - NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0);
201 + NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0,
205 void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
206 @@ -15963,23 +15968,25 @@ void nl80211_send_rx_assoc(struct cfg802
208 nl80211_send_mlme_event(rdev, netdev, buf, len,
209 NL80211_CMD_ASSOCIATE, gfp, uapsd_queues,
210 - req_ies, req_ies_len);
211 + req_ies, req_ies_len, false);
214 void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
215 struct net_device *netdev, const u8 *buf,
216 - size_t len, gfp_t gfp)
217 + size_t len, bool reconnect, gfp_t gfp)
219 nl80211_send_mlme_event(rdev, netdev, buf, len,
220 - NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0);
221 + NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0,
225 void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
226 struct net_device *netdev, const u8 *buf,
227 - size_t len, gfp_t gfp)
228 + size_t len, bool reconnect, gfp_t gfp)
230 nl80211_send_mlme_event(rdev, netdev, buf, len,
231 - NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0);
232 + NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0,
236 void cfg80211_rx_unprot_mlme_mgmt(struct net_device *dev, const u8 *buf,
237 @@ -16010,7 +16017,7 @@ void cfg80211_rx_unprot_mlme_mgmt(struct
239 trace_cfg80211_rx_unprot_mlme_mgmt(dev, buf, len);
240 nl80211_send_mlme_event(rdev, dev, buf, len, cmd, GFP_ATOMIC, -1,
244 EXPORT_SYMBOL(cfg80211_rx_unprot_mlme_mgmt);
246 --- a/net/wireless/nl80211.h
247 +++ b/net/wireless/nl80211.h
249 /* SPDX-License-Identifier: GPL-2.0 */
251 * Portions of this file
252 - * Copyright (C) 2018 Intel Corporation
253 + * Copyright (C) 2018, 2020 Intel Corporation
255 #ifndef __NET_WIRELESS_NL80211_H
256 #define __NET_WIRELESS_NL80211_H
257 @@ -69,10 +69,12 @@ void nl80211_send_rx_assoc(struct cfg802
258 const u8 *req_ies, size_t req_ies_len);
259 void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
260 struct net_device *netdev,
261 - const u8 *buf, size_t len, gfp_t gfp);
262 + const u8 *buf, size_t len,
263 + bool reconnect, gfp_t gfp);
264 void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
265 struct net_device *netdev,
266 - const u8 *buf, size_t len, gfp_t gfp);
267 + const u8 *buf, size_t len,
268 + bool reconnect, gfp_t gfp);
269 void nl80211_send_auth_timeout(struct cfg80211_registered_device *rdev,
270 struct net_device *netdev,
271 const u8 *addr, gfp_t gfp);
272 --- a/net/wireless/trace.h
273 +++ b/net/wireless/trace.h
274 @@ -2684,19 +2684,23 @@ DEFINE_EVENT(netdev_frame_event, cfg8021
277 TRACE_EVENT(cfg80211_tx_mlme_mgmt,
278 - TP_PROTO(struct net_device *netdev, const u8 *buf, int len),
279 - TP_ARGS(netdev, buf, len),
280 + TP_PROTO(struct net_device *netdev, const u8 *buf, int len,
282 + TP_ARGS(netdev, buf, len, reconnect),
285 __dynamic_array(u8, frame, len)
286 + __field(int, reconnect)
290 memcpy(__get_dynamic_array(frame), buf, len);
291 + __entry->reconnect = reconnect;
293 - TP_printk(NETDEV_PR_FMT ", ftype:0x%.2x",
294 + TP_printk(NETDEV_PR_FMT ", ftype:0x%.2x reconnect:%d",
296 - le16_to_cpup((__le16 *)__get_dynamic_array(frame)))
297 + le16_to_cpup((__le16 *)__get_dynamic_array(frame)),
298 + __entry->reconnect)
301 DECLARE_EVENT_CLASS(netdev_mac_evt,