package/kernel/mac80211/patches/subsys/300-cfg80211-support-immediate-reconnect-request-hint.patch

   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
   4
   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.
   9
  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>
  13 ---
  14
  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)
  22   *
  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.
  27   */
  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,
  30 +                          bool reconnect);
  31
  32  /**
  33   * cfg80211_rx_unprot_mlme_mgmt - notification of unprotected mlme mgmt frame
  34 --- a/net/mac80211/mlme.c
  35 +++ b/net/mac80211/mlme.c
  36 @@ -2734,7 +2734,7 @@ static void ieee80211_report_disconnect(
  37         };
  38
  39         if (tx)
  40 -               cfg80211_tx_mlme_mgmt(sdata->dev, buf, len);
  41 +               cfg80211_tx_mlme_mgmt(sdata->dev, buf, len, false);
  42         else
  43                 cfg80211_rx_mlme_mgmt(sdata->dev, buf, len);
  44
  45 @@ -4724,7 +4724,8 @@ void ieee80211_mgd_quiesce(struct ieee80
  46                 if (ifmgd->auth_data)
  47                         ieee80211_destroy_auth_data(sdata, false);
  48                 cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
  49 -                                     IEEE80211_DEAUTH_FRAME_LEN);
  50 +                                     IEEE80211_DEAUTH_FRAME_LEN,
  51 +                                     false);
  52         }
  53
  54         /* This is a bit of a hack - we should find a better and more generic
  55 --- a/net/wireless/mlme.c
  56 +++ b/net/wireless/mlme.c
  57 @@ -4,7 +4,7 @@
  58   *
  59   * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
  60   * Copyright (c) 2015          Intel Deutschland GmbH
  61 - * Copyright (C) 2019 Intel Corporation
  62 + * Copyright (C) 2019-2020 Intel Corporation
  63   */
  64
  65  #include <linux/kernel.h>
  66 @@ -81,7 +81,8 @@ static void cfg80211_process_auth(struct
  67  }
  68
  69  static void cfg80211_process_deauth(struct wireless_dev *wdev,
  70 -                                   const u8 *buf, size_t len)
  71 +                                   const u8 *buf, size_t len,
  72 +                                   bool reconnect)
  73  {
  74         struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
  75         struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
  76 @@ -89,7 +90,7 @@ static void cfg80211_process_deauth(stru
  77         u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
  78         bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);
  79
  80 -       nl80211_send_deauth(rdev, wdev->netdev, buf, len, GFP_KERNEL);
  81 +       nl80211_send_deauth(rdev, wdev->netdev, buf, len, reconnect, GFP_KERNEL);
  82
  83         if (!wdev->current_bss ||
  84             !ether_addr_equal(wdev->current_bss->pub.bssid, bssid))
  85 @@ -100,7 +101,8 @@ static void cfg80211_process_deauth(stru
  86  }
  87
  88  static void cfg80211_process_disassoc(struct wireless_dev *wdev,
  89 -                                     const u8 *buf, size_t len)
  90 +                                     const u8 *buf, size_t len,
  91 +                                     bool reconnect)
  92  {
  93         struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
  94         struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
  95 @@ -108,7 +110,8 @@ static void cfg80211_process_disassoc(st
  96         u16 reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
  97         bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);
  98
  99 -       nl80211_send_disassoc(rdev, wdev->netdev, buf, len, GFP_KERNEL);
 100 +       nl80211_send_disassoc(rdev, wdev->netdev, buf, len, reconnect,
 101 +                             GFP_KERNEL);
 102
 103         if (WARN_ON(!wdev->current_bss ||
 104                     !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))
 105 @@ -133,9 +136,9 @@ void cfg80211_rx_mlme_mgmt(struct net_de
 106         if (ieee80211_is_auth(mgmt->frame_control))
 107                 cfg80211_process_auth(wdev, buf, len);
 108         else if (ieee80211_is_deauth(mgmt->frame_control))
 109 -               cfg80211_process_deauth(wdev, buf, len);
 110 +               cfg80211_process_deauth(wdev, buf, len, false);
 111         else if (ieee80211_is_disassoc(mgmt->frame_control))
 112 -               cfg80211_process_disassoc(wdev, buf, len);
 113 +               cfg80211_process_disassoc(wdev, buf, len, false);
 114  }
 115  EXPORT_SYMBOL(cfg80211_rx_mlme_mgmt);
 116
 117 @@ -180,22 +183,23 @@ void cfg80211_abandon_assoc(struct net_d
 118  }
 119  EXPORT_SYMBOL(cfg80211_abandon_assoc);
 120
 121 -void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len)
 122 +void cfg80211_tx_mlme_mgmt(struct net_device *dev, const u8 *buf, size_t len,
 123 +                          bool reconnect)
 124  {
 125         struct wireless_dev *wdev = dev->ieee80211_ptr;
 126         struct ieee80211_mgmt *mgmt = (void *)buf;
 127
 128         ASSERT_WDEV_LOCK(wdev);
 129
 130 -       trace_cfg80211_tx_mlme_mgmt(dev, buf, len);
 131 +       trace_cfg80211_tx_mlme_mgmt(dev, buf, len, reconnect);
 132
 133         if (WARN_ON(len < 2))
 134                 return;
 135
 136         if (ieee80211_is_deauth(mgmt->frame_control))
 137 -               cfg80211_process_deauth(wdev, buf, len);
 138 +               cfg80211_process_deauth(wdev, buf, len, reconnect);
 139         else
 140 -               cfg80211_process_disassoc(wdev, buf, len);
 141 +               cfg80211_process_disassoc(wdev, buf, len, reconnect);
 142  }
 143  EXPORT_SYMBOL(cfg80211_tx_mlme_mgmt);
 144
 145 --- a/net/wireless/nl80211.c
 146 +++ b/net/wireless/nl80211.c
 147 @@ -736,6 +736,7 @@ static const struct nla_policy nl80211_p
 148                 NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
 149         [NL80211_ATTR_S1G_CAPABILITY_MASK] =
 150                 NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
 151 +       [NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },
 152  };
 153
 154  /* policy for the key attributes */
 155 @@ -15903,7 +15904,7 @@ static void nl80211_send_mlme_event(stru
 156                                     const u8 *buf, size_t len,
 157                                     enum nl80211_commands cmd, gfp_t gfp,
 158                                     int uapsd_queues, const u8 *req_ies,
 159 -                                   size_t req_ies_len)
 160 +                                   size_t req_ies_len, bool reconnect)
 161  {
 162         struct sk_buff *msg;
 163         void *hdr;
 164 @@ -15925,6 +15926,9 @@ static void nl80211_send_mlme_event(stru
 165              nla_put(msg, NL80211_ATTR_REQ_IE, req_ies_len, req_ies)))
 166                 goto nla_put_failure;
 167
 168 +       if (reconnect && nla_put_flag(msg, NL80211_ATTR_RECONNECT_REQUESTED))
 169 +               goto nla_put_failure;
 170 +
 171         if (uapsd_queues >= 0) {
 172                 struct nlattr *nla_wmm =
 173                         nla_nest_start_noflag(msg, NL80211_ATTR_STA_WME);
 174 @@ -15953,7 +15957,8 @@ void nl80211_send_rx_auth(struct cfg8021
 175                           size_t len, gfp_t gfp)
 176  {
 177         nl80211_send_mlme_event(rdev, netdev, buf, len,
 178 -                               NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0);
 179 +                               NL80211_CMD_AUTHENTICATE, gfp, -1, NULL, 0,
 180 +                               false);
 181  }
 182
 183  void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
 184 @@ -15963,23 +15968,25 @@ void nl80211_send_rx_assoc(struct cfg802
 185  {
 186         nl80211_send_mlme_event(rdev, netdev, buf, len,
 187                                 NL80211_CMD_ASSOCIATE, gfp, uapsd_queues,
 188 -                               req_ies, req_ies_len);
 189 +                               req_ies, req_ies_len, false);
 190  }
 191
 192  void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
 193                          struct net_device *netdev, const u8 *buf,
 194 -                        size_t len, gfp_t gfp)
 195 +                        size_t len, bool reconnect, gfp_t gfp)
 196  {
 197         nl80211_send_mlme_event(rdev, netdev, buf, len,
 198 -                               NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0);
 199 +                               NL80211_CMD_DEAUTHENTICATE, gfp, -1, NULL, 0,
 200 +                               reconnect);
 201  }
 202
 203  void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
 204                            struct net_device *netdev, const u8 *buf,
 205 -                          size_t len, gfp_t gfp)
 206 +                          size_t len, bool reconnect, gfp_t gfp)
 207  {
 208         nl80211_send_mlme_event(rdev, netdev, buf, len,
 209 -                               NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0);
 210 +                               NL80211_CMD_DISASSOCIATE, gfp, -1, NULL, 0,
 211 +                               reconnect);
 212  }
 213
 214  void cfg80211_rx_unprot_mlme_mgmt(struct net_device *dev, const u8 *buf,
 215 @@ -16010,7 +16017,7 @@ void cfg80211_rx_unprot_mlme_mgmt(struct
 216
 217         trace_cfg80211_rx_unprot_mlme_mgmt(dev, buf, len);
 218         nl80211_send_mlme_event(rdev, dev, buf, len, cmd, GFP_ATOMIC, -1,
 219 -                               NULL, 0);
 220 +                               NULL, 0, false);
 221  }
 222  EXPORT_SYMBOL(cfg80211_rx_unprot_mlme_mgmt);
 223
 224 --- a/net/wireless/nl80211.h
 225 +++ b/net/wireless/nl80211.h
 226 @@ -1,7 +1,7 @@
 227  /* SPDX-License-Identifier: GPL-2.0 */
 228  /*
 229   * Portions of this file
 230 - * Copyright (C) 2018 Intel Corporation
 231 + * Copyright (C) 2018, 2020 Intel Corporation
 232   */
 233  #ifndef __NET_WIRELESS_NL80211_H
 234  #define __NET_WIRELESS_NL80211_H
 235 @@ -69,10 +69,12 @@ void nl80211_send_rx_assoc(struct cfg802
 236                            const u8 *req_ies, size_t req_ies_len);
 237  void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
 238                          struct net_device *netdev,
 239 -                        const u8 *buf, size_t len, gfp_t gfp);
 240 +                        const u8 *buf, size_t len,
 241 +                        bool reconnect, gfp_t gfp);
 242  void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
 243                            struct net_device *netdev,
 244 -                          const u8 *buf, size_t len, gfp_t gfp);
 245 +                          const u8 *buf, size_t len,
 246 +                          bool reconnect, gfp_t gfp);
 247  void nl80211_send_auth_timeout(struct cfg80211_registered_device *rdev,
 248                                struct net_device *netdev,
 249                                const u8 *addr, gfp_t gfp);
 250 --- a/net/wireless/trace.h
 251 +++ b/net/wireless/trace.h
 252 @@ -2684,19 +2684,23 @@ DEFINE_EVENT(netdev_frame_event, cfg8021
 253  );
 254
 255  TRACE_EVENT(cfg80211_tx_mlme_mgmt,
 256 -       TP_PROTO(struct net_device *netdev, const u8 *buf, int len),
 257 -       TP_ARGS(netdev, buf, len),
 258 +       TP_PROTO(struct net_device *netdev, const u8 *buf, int len,
 259 +                bool reconnect),
 260 +       TP_ARGS(netdev, buf, len, reconnect),
 261         TP_STRUCT__entry(
 262                 NETDEV_ENTRY
 263                 __dynamic_array(u8, frame, len)
 264 +               __field(int, reconnect)
 265         ),
 266         TP_fast_assign(
 267                 NETDEV_ASSIGN;
 268                 memcpy(__get_dynamic_array(frame), buf, len);
 269 +               __entry->reconnect = reconnect;
 270         ),
 271 -       TP_printk(NETDEV_PR_FMT ", ftype:0x%.2x",
 272 +       TP_printk(NETDEV_PR_FMT ", ftype:0x%.2x reconnect:%d",
 273                   NETDEV_PR_ARG,
 274 -                 le16_to_cpup((__le16 *)__get_dynamic_array(frame)))
 275 +                 le16_to_cpup((__le16 *)__get_dynamic_array(frame)),
 276 +                 __entry->reconnect)
 277  );
 278
 279  DECLARE_EVENT_CLASS(netdev_mac_evt,