]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - src/drivers/driver_nl80211.c
nl80211: Missing sysctl flags aren't fatal
[thirdparty/hostap.git] / src / drivers / driver_nl80211.c
index 9d8137e009b6db0919e59cf7b697e3b98af83c84..7ed1878ad93b973afaa30c8d3b7b327ee668af48 100644 (file)
 #include "driver_nl80211.h"
 
 
+#ifndef NETLINK_CAP_ACK
+#define NETLINK_CAP_ACK 10
+#endif /* NETLINK_CAP_ACK */
+/* support for extack if compilation headers are too old */
+#ifndef NETLINK_EXT_ACK
+#define NETLINK_EXT_ACK 11
+enum nlmsgerr_attrs {
+       NLMSGERR_ATTR_UNUSED,
+       NLMSGERR_ATTR_MSG,
+       NLMSGERR_ATTR_OFFS,
+       NLMSGERR_ATTR_COOKIE,
+
+       __NLMSGERR_ATTR_MAX,
+       NLMSGERR_ATTR_MAX = __NLMSGERR_ATTR_MAX - 1
+};
+#endif
+#ifndef NLM_F_CAPPED
+#define NLM_F_CAPPED 0x100
+#endif
+#ifndef NLM_F_ACK_TLVS
+#define NLM_F_ACK_TLVS 0x200
+#endif
+#ifndef SOL_NETLINK
+#define SOL_NETLINK 270
+#endif
+
 #ifndef CONFIG_LIBNL20
 /*
  * libnl 1.1 has a bug, it tries to allocate socket numbers densely
@@ -210,7 +236,7 @@ static int nl80211_put_mesh_config(struct nl_msg *msg,
                                   struct wpa_driver_mesh_bss_params *params);
 #endif /* CONFIG_MESH */
 static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
-                            int reason);
+                            u16 reason);
 
 
 /* Converts nl80211_chan_width to a common format */
@@ -281,6 +307,7 @@ void nl80211_mark_disconnected(struct wpa_driver_nl80211_data *drv)
                os_memcpy(drv->prev_bssid, drv->bssid, ETH_ALEN);
        drv->associated = 0;
        os_memset(drv->bssid, 0, ETH_ALEN);
+       drv->first_bss->freq = 0;
 }
 
 
@@ -302,8 +329,35 @@ static int finish_handler(struct nl_msg *msg, void *arg)
 static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
                         void *arg)
 {
+       struct nlmsghdr *nlh = (struct nlmsghdr *) err - 1;
+       int len = nlh->nlmsg_len;
+       struct nlattr *attrs;
+       struct nlattr *tb[NLMSGERR_ATTR_MAX + 1];
        int *ret = arg;
+       int ack_len = sizeof(*nlh) + sizeof(int) + sizeof(*nlh);
+
        *ret = err->error;
+
+       if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS))
+               return NL_SKIP;
+
+       if (!(nlh->nlmsg_flags & NLM_F_CAPPED))
+               ack_len += err->msg.nlmsg_len - sizeof(*nlh);
+
+       if (len <= ack_len)
+               return NL_STOP;
+
+       attrs = (void *) ((unsigned char *) nlh + ack_len);
+       len -= ack_len;
+
+       nla_parse(tb, NLMSGERR_ATTR_MAX, attrs, len, NULL);
+       if (tb[NLMSGERR_ATTR_MSG]) {
+               len = strnlen((char *) nla_data(tb[NLMSGERR_ATTR_MSG]),
+                             nla_len(tb[NLMSGERR_ATTR_MSG]));
+               wpa_printf(MSG_ERROR, "nl80211: kernel reports: %*s",
+                          len, (char *) nla_data(tb[NLMSGERR_ATTR_MSG]));
+       }
+
        return NL_SKIP;
 }
 
@@ -342,7 +396,7 @@ static int send_and_recv(struct nl80211_global *global,
                         void *valid_data)
 {
        struct nl_cb *cb;
-       int err = -ENOMEM;
+       int err = -ENOMEM, opt;
 
        if (!msg)
                return -ENOMEM;
@@ -351,6 +405,16 @@ static int send_and_recv(struct nl80211_global *global,
        if (!cb)
                goto out;
 
+       /* try to set NETLINK_EXT_ACK to 1, ignoring errors */
+       opt = 1;
+       setsockopt(nl_socket_get_fd(nl_handle), SOL_NETLINK,
+                  NETLINK_EXT_ACK, &opt, sizeof(opt));
+
+       /* try to set NETLINK_CAP_ACK to 1, ignoring errors */
+       opt = 1;
+       setsockopt(nl_socket_get_fd(nl_handle), SOL_NETLINK,
+                  NETLINK_CAP_ACK, &opt, sizeof(opt));
+
        err = nl_send_auto_complete(nl_handle, msg);
        if (err < 0)
                goto out;
@@ -1079,11 +1143,20 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
        }
 
        if (drv->if_disabled && (ifi->ifi_flags & IFF_UP)) {
+               namebuf[0] = '\0';
                if (if_indextoname(ifi->ifi_index, namebuf) &&
                    linux_iface_up(drv->global->ioctl_sock, namebuf) == 0) {
                        wpa_printf(MSG_DEBUG, "nl80211: Ignore interface up "
                                   "event since interface %s is down",
                                   namebuf);
+                       return;
+               }
+               wpa_printf(MSG_DEBUG, "nl80211: Interface up (%s/%s)",
+                          namebuf, ifname);
+               if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Not the main interface (%s) - do not indicate interface up",
+                                  drv->first_bss->ifname);
                } else if (if_nametoindex(drv->first_bss->ifname) == 0) {
                        wpa_printf(MSG_DEBUG, "nl80211: Ignore interface up "
                                   "event since interface %s does not exist",
@@ -1096,7 +1169,6 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
                        /* Re-read MAC address as it may have changed */
                        nl80211_refresh_mac(drv, ifi->ifi_index, 0);
 
-                       wpa_printf(MSG_DEBUG, "nl80211: Interface up");
                        drv->if_disabled = 0;
                        wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
                                             NULL);
@@ -1406,7 +1478,7 @@ int nl80211_get_link_signal(struct wpa_driver_nl80211_data *drv,
 {
        struct nl_msg *msg;
 
-       sig->current_signal = -9999;
+       sig->current_signal = -WPA_INVALID_NOISE;
        sig->current_txrate = 0;
 
        if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_STATION)) ||
@@ -1468,7 +1540,7 @@ int nl80211_get_link_noise(struct wpa_driver_nl80211_data *drv,
 {
        struct nl_msg *msg;
 
-       sig_change->current_noise = 9999;
+       sig_change->current_noise = WPA_INVALID_NOISE;
        sig_change->frequency = drv->assoc_freq;
 
        msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
@@ -1476,6 +1548,70 @@ int nl80211_get_link_noise(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static int get_channel_info(struct nl_msg *msg, void *arg)
+{
+       struct nlattr *tb[NL80211_ATTR_MAX + 1] = { 0 };
+       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+       struct wpa_channel_info *chan_info = arg;
+
+       nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
+                 genlmsg_attrlen(gnlh, 0), NULL);
+
+       os_memset(chan_info, 0, sizeof(struct wpa_channel_info));
+       chan_info->chanwidth = CHAN_WIDTH_UNKNOWN;
+
+       if (tb[NL80211_ATTR_WIPHY_FREQ])
+               chan_info->frequency =
+                       nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]);
+       if (tb[NL80211_ATTR_CHANNEL_WIDTH])
+               chan_info->chanwidth = convert2width(
+                       nla_get_u32(tb[NL80211_ATTR_CHANNEL_WIDTH]));
+       if (tb[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
+               enum nl80211_channel_type ct =
+                       nla_get_u32(tb[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+
+               switch (ct) {
+               case NL80211_CHAN_HT40MINUS:
+                       chan_info->sec_channel = -1;
+                       break;
+               case NL80211_CHAN_HT40PLUS:
+                       chan_info->sec_channel = 1;
+                       break;
+               default:
+                       chan_info->sec_channel = 0;
+                       break;
+               }
+       }
+       if (tb[NL80211_ATTR_CENTER_FREQ1])
+               chan_info->center_frq1 =
+                       nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ1]);
+       if (tb[NL80211_ATTR_CENTER_FREQ2])
+               chan_info->center_frq2 =
+                       nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ2]);
+
+       if (chan_info->center_frq2) {
+               u8 seg1_idx = 0;
+
+               if (ieee80211_freq_to_chan(chan_info->center_frq2, &seg1_idx) !=
+                   NUM_HOSTAPD_MODES)
+                       chan_info->seg1_idx = seg1_idx;
+       }
+
+       return NL_SKIP;
+}
+
+
+static int nl80211_channel_info(void *priv, struct wpa_channel_info *ci)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
+       return send_and_recv_msgs(drv, msg, get_channel_info, ci);
+}
+
+
 static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx,
                                             void *handle)
 {
@@ -1874,9 +2010,8 @@ static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
         */
        drv->set_rekey_offload = 1;
 
-       drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
+       drv->num_if_indices = ARRAY_SIZE(drv->default_if_indices);
        drv->if_indices = drv->default_if_indices;
-       drv->if_indices_reason = drv->default_if_indices_reason;
 
        drv->first_bss = os_zalloc(sizeof(*drv->first_bss));
        if (!drv->first_bss) {
@@ -2106,6 +2241,11 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
                ret = -1;
 #endif /* CONFIG_DPP */
 #ifdef CONFIG_IEEE80211W
+#ifdef CONFIG_OCV
+       /* SA Query Request */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x08\x00", 2) < 0)
+               ret = -1;
+#endif /* CONFIG_OCV */
        /* SA Query Response */
        if (nl80211_register_action_frame(bss, (u8 *) "\x08\x01", 2) < 0)
                ret = -1;
@@ -2137,6 +2277,11 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
        /* WNM-Sleep Mode Response */
        if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x11", 2) < 0)
                ret = -1;
+#ifdef CONFIG_WNM
+       /* WNM - Collocated Interference Request */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x0b", 2) < 0)
+               ret = -1;
+#endif /* CONFIG_WNM */
 
 #ifdef CONFIG_HS20
        /* WNM-Notification */
@@ -2324,6 +2469,16 @@ static int nl80211_mgmt_subscribe_ap_dev_sme(struct i802_bss *bss)
        if (nl80211_action_subscribe_ap(bss))
                goto out_err;
 
+       if (bss->drv->device_ap_sme) {
+               u16 type = (WLAN_FC_TYPE_MGMT << 2) | (WLAN_FC_STYPE_AUTH << 4);
+
+               /* Register for all Authentication frames */
+               if (nl80211_register_frame(bss, bss->nl_mgmt, type, NULL, 0)
+                   < 0)
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Failed to subscribe to handle Authentication frames - SAE offload may not work");
+       }
+
        nl80211_mgmt_handle_register_eloop(bss);
        return 0;
 
@@ -2633,9 +2788,6 @@ static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
        if (drv->if_indices != drv->default_if_indices)
                os_free(drv->if_indices);
 
-       if (drv->if_indices_reason != drv->default_if_indices_reason)
-               os_free(drv->if_indices_reason);
-
        if (drv->disabled_11b_rates)
                nl80211_disable_11b_rates(drv, drv->ifindex, 0);
 
@@ -2894,7 +3046,7 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
 #endif /* CONFIG_DRIVER_NL80211_QCA */
 
        if (alg == WPA_ALG_PMK &&
-           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X))
                return nl80211_set_pmk(drv, key, key_len, addr);
 
        if (alg == WPA_ALG_NONE) {
@@ -3097,7 +3249,8 @@ static int nl80211_set_conn_keys(struct wpa_driver_associate_params *params,
 
 int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
                            const u8 *addr, int cmd, u16 reason_code,
-                           int local_state_change)
+                           int local_state_change,
+                           struct nl_handle *nl_connect)
 {
        int ret;
        struct nl_msg *msg;
@@ -3111,7 +3264,10 @@ int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
                return -1;
        }
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (nl_connect)
+               ret = send_and_recv(drv->global, nl_connect, msg, NULL, NULL);
+       else
+               ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret) {
                wpa_dbg(drv->ctx, MSG_DEBUG,
                        "nl80211: MLME command failed: reason=%u ret=%d (%s)",
@@ -3122,47 +3278,57 @@ int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
 
 
 static int wpa_driver_nl80211_disconnect(struct wpa_driver_nl80211_data *drv,
-                                        int reason_code)
+                                        u16 reason_code,
+                                        struct nl_handle *nl_connect)
 {
        int ret;
+       int drv_associated = drv->associated;
 
        wpa_printf(MSG_DEBUG, "%s(reason_code=%d)", __func__, reason_code);
        nl80211_mark_disconnected(drv);
        /* Disconnect command doesn't need BSSID - it uses cached value */
        ret = wpa_driver_nl80211_mlme(drv, NULL, NL80211_CMD_DISCONNECT,
-                                     reason_code, 0);
+                                     reason_code, 0, nl_connect);
        /*
         * For locally generated disconnect, supplicant already generates a
         * DEAUTH event, so ignore the event from NL80211.
         */
-       drv->ignore_next_local_disconnect = ret == 0;
+       drv->ignore_next_local_disconnect = drv_associated && (ret == 0);
 
        return ret;
 }
 
 
 static int wpa_driver_nl80211_deauthenticate(struct i802_bss *bss,
-                                            const u8 *addr, int reason_code)
+                                            const u8 *addr, u16 reason_code)
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret;
+       int drv_associated = drv->associated;
 
        if (drv->nlmode == NL80211_IFTYPE_ADHOC) {
                nl80211_mark_disconnected(drv);
                return nl80211_leave_ibss(drv, 1);
        }
-       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME))
-               return wpa_driver_nl80211_disconnect(drv, reason_code);
+       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME)) {
+               struct nl_handle *nl_connect = NULL;
+
+               if (bss->use_nl_connect)
+                       nl_connect = bss->nl_connect;
+               return wpa_driver_nl80211_disconnect(drv, reason_code,
+                                                    nl_connect);
+       }
        wpa_printf(MSG_DEBUG, "%s(addr=" MACSTR " reason_code=%d)",
                   __func__, MAC2STR(addr), reason_code);
        nl80211_mark_disconnected(drv);
        ret = wpa_driver_nl80211_mlme(drv, addr, NL80211_CMD_DEAUTHENTICATE,
-                                     reason_code, 0);
+                                     reason_code, 0, NULL);
        /*
         * For locally generated deauthenticate, supplicant already generates a
         * DEAUTH event, so ignore the event from NL80211.
         */
-       drv->ignore_next_local_deauth = ret == 0;
+       drv->ignore_next_local_deauth = drv_associated && (ret == 0);
+
        return ret;
 }
 
@@ -3318,8 +3484,8 @@ retry:
                        goto fail;
        }
        if (params->ssid) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                                 params->ssid, params->ssid_len);
+               wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                          wpa_ssid_txt(params->ssid, params->ssid_len));
                if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
                            params->ssid))
                        goto fail;
@@ -3886,7 +4052,7 @@ static int wpa_driver_nl80211_set_ap(void *priv,
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        u8 cmd = NL80211_CMD_NEW_BEACON;
-       int ret;
+       int ret = -ENOBUFS;
        int beacon_set;
        int num_suites;
        int smps_mode;
@@ -3915,8 +4081,8 @@ static int wpa_driver_nl80211_set_ap(void *priv,
        wpa_printf(MSG_DEBUG, "nl80211: beacon_rate=%u", params->beacon_rate);
        wpa_printf(MSG_DEBUG, "nl80211: rate_type=%d", params->rate_type);
        wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period);
-       wpa_hexdump_ascii(MSG_DEBUG, "nl80211: ssid",
-                         params->ssid, params->ssid_len);
+       wpa_printf(MSG_DEBUG, "nl80211: ssid=%s",
+                  wpa_ssid_txt(params->ssid, params->ssid_len));
        if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
            nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len,
                    params->head) ||
@@ -4001,6 +4167,11 @@ static int wpa_driver_nl80211_set_ap(void *priv,
             nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT)))
                goto fail;
 
+       if (drv->device_ap_sme &&
+           (params->key_mgmt_suites & WPA_KEY_MGMT_SAE) &&
+           nla_put_flag(msg, NL80211_ATTR_EXTERNAL_AUTH_SUPPORT))
+               goto fail;
+
        wpa_printf(MSG_DEBUG, "nl80211: pairwise_ciphers=0x%x",
                   params->pairwise_ciphers);
        num_suites = wpa_cipher_to_cipher_suites(params->pairwise_ciphers,
@@ -4092,6 +4263,29 @@ static int wpa_driver_nl80211_set_ap(void *priv,
                        goto fail;
        }
 
+       if (params->ftm_responder) {
+               struct nlattr *ftm;
+
+               if (!(drv->capa.flags & WPA_DRIVER_FLAGS_FTM_RESPONDER)) {
+                       ret = -ENOTSUP;
+                       goto fail;
+               }
+
+               ftm = nla_nest_start(msg, NL80211_ATTR_FTM_RESPONDER);
+               if (!ftm ||
+                   nla_put_flag(msg, NL80211_FTM_RESP_ATTR_ENABLED) ||
+                   (params->lci &&
+                    nla_put(msg, NL80211_FTM_RESP_ATTR_LCI,
+                            wpabuf_len(params->lci),
+                            wpabuf_head(params->lci))) ||
+                   (params->civic &&
+                    nla_put(msg, NL80211_FTM_RESP_ATTR_CIVICLOC,
+                            wpabuf_len(params->civic),
+                            wpabuf_head(params->civic))))
+                       goto fail;
+               nla_nest_end(msg, ftm);
+       }
+
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)",
@@ -4143,7 +4337,7 @@ static int wpa_driver_nl80211_set_ap(void *priv,
        return ret;
 fail:
        nlmsg_free(msg);
-       return -ENOBUFS;
+       return ret;
 }
 
 
@@ -4154,10 +4348,11 @@ static int nl80211_put_freq_params(struct nl_msg *msg,
        if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq->freq))
                return -ENOBUFS;
 
+       wpa_printf(MSG_DEBUG, "  * he_enabled=%d", freq->he_enabled);
        wpa_printf(MSG_DEBUG, "  * vht_enabled=%d", freq->vht_enabled);
        wpa_printf(MSG_DEBUG, "  * ht_enabled=%d", freq->ht_enabled);
 
-       if (freq->vht_enabled) {
+       if (freq->vht_enabled || freq->he_enabled) {
                enum nl80211_chan_width cw;
 
                wpa_printf(MSG_DEBUG, "  * bandwidth=%d", freq->bandwidth);
@@ -4232,8 +4427,8 @@ static int nl80211_set_channel(struct i802_bss *bss,
        int ret;
 
        wpa_printf(MSG_DEBUG,
-                  "nl80211: Set freq %d (ht_enabled=%d, vht_enabled=%d, bandwidth=%d MHz, cf1=%d MHz, cf2=%d MHz)",
-                  freq->freq, freq->ht_enabled, freq->vht_enabled,
+                  "nl80211: Set freq %d (ht_enabled=%d, vht_enabled=%d, he_enabled=%d, bandwidth=%d MHz, cf1=%d MHz, cf2=%d MHz)",
+                  freq->freq, freq->ht_enabled, freq->vht_enabled, freq->he_enabled,
                   freq->bandwidth, freq->center_freq1, freq->center_freq2);
 
        msg = nl80211_drv_msg(drv, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
@@ -4365,6 +4560,14 @@ static int wpa_driver_nl80211_sta_add(void *priv,
                                goto fail;
                }
 
+               if (params->he_capab) {
+                       wpa_hexdump(MSG_DEBUG, "  * he_capab",
+                                   params->he_capab, params->he_capab_len);
+                       if (nla_put(msg, NL80211_ATTR_HE_CAPABILITY,
+                                   params->he_capab_len, params->he_capab))
+                               goto fail;
+               }
+
                if (params->ext_capab) {
                        wpa_hexdump(MSG_DEBUG, "  * ext_capab",
                                    params->ext_capab, params->ext_capab_len);
@@ -4497,7 +4700,9 @@ static int wpa_driver_nl80211_sta_add(void *priv,
                goto fail;
 #endif /* CONFIG_MESH */
 
-       if (params->flags & WPA_STA_WMM) {
+       if ((!params->set || (params->flags & WPA_STA_TDLS_PEER) ||
+            FULL_AP_CLIENT_STATE_SUPP(drv->capa.flags)) &&
+            (params->flags & WPA_STA_WMM)) {
                struct nlattr *wme = nla_nest_start(msg, NL80211_ATTR_STA_WME);
 
                wpa_printf(MSG_DEBUG, "  * qosinfo=0x%x", params->qosinfo);
@@ -4988,6 +5193,28 @@ fail:
 }
 
 
+static int driver_nl80211_sta_set_airtime_weight(void *priv, const u8 *addr,
+                                                unsigned int weight)
+{
+       struct i802_bss *bss = priv;
+       struct nl_msg *msg;
+
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: Set STA airtime weight - ifname=%s addr=" MACSTR
+                  " weight=%u", bss->ifname, MAC2STR(addr), weight);
+
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           nla_put_u16(msg, NL80211_ATTR_AIRTIME_WEIGHT, weight))
+               goto fail;
+
+       return send_and_recv_msgs(bss->drv, msg, NULL, NULL);
+fail:
+       nlmsg_free(msg);
+       return -ENOBUFS;
+}
+
+
 static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv,
                                 struct wpa_driver_associate_params *params)
 {
@@ -5107,8 +5334,8 @@ retry:
            params->ssid == NULL || params->ssid_len > sizeof(drv->ssid))
                goto fail;
 
-       wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                         params->ssid, params->ssid_len);
+       wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                  wpa_ssid_txt(params->ssid, params->ssid_len));
        if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
                goto fail;
        os_memcpy(drv->ssid, params->ssid, params->ssid_len);
@@ -5269,8 +5496,8 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
        }
 
        if (params->ssid) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                                 params->ssid, params->ssid_len);
+               wpa_printf(MSG_DEBUG, "  * SSID=%s",
+                          wpa_ssid_txt(params->ssid, params->ssid_len));
                if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
                            params->ssid))
                        return -1;
@@ -5328,8 +5555,11 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
            params->key_mgmt_suite == WPA_KEY_MGMT_OSEN ||
            params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SHA256 ||
            params->key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256 ||
+           params->key_mgmt_suite == WPA_KEY_MGMT_SAE ||
+           params->key_mgmt_suite == WPA_KEY_MGMT_FT_SAE ||
            params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B ||
            params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 ||
+           params->key_mgmt_suite == WPA_KEY_MGMT_FT_IEEE8021X_SHA384 ||
            params->key_mgmt_suite == WPA_KEY_MGMT_FILS_SHA256 ||
            params->key_mgmt_suite == WPA_KEY_MGMT_FILS_SHA384 ||
            params->key_mgmt_suite == WPA_KEY_MGMT_FT_FILS_SHA256 ||
@@ -5360,12 +5590,21 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
                case WPA_KEY_MGMT_OSEN:
                        mgmt = RSN_AUTH_KEY_MGMT_OSEN;
                        break;
+               case WPA_KEY_MGMT_SAE:
+                       mgmt = RSN_AUTH_KEY_MGMT_SAE;
+                       break;
+               case WPA_KEY_MGMT_FT_SAE:
+                       mgmt = RSN_AUTH_KEY_MGMT_FT_SAE;
+                       break;
                case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
                        mgmt = RSN_AUTH_KEY_MGMT_802_1X_SUITE_B;
                        break;
                case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
                        mgmt = RSN_AUTH_KEY_MGMT_802_1X_SUITE_B_192;
                        break;
+               case WPA_KEY_MGMT_FT_IEEE8021X_SHA384:
+                       mgmt = RSN_AUTH_KEY_MGMT_FT_802_1X_SHA384;
+                       break;
                case WPA_KEY_MGMT_FILS_SHA256:
                        mgmt = RSN_AUTH_KEY_MGMT_FILS_SHA256;
                        break;
@@ -5394,9 +5633,16 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
                        return -1;
        }
 
+       if (params->req_key_mgmt_offload &&
+           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X)) {
+                   wpa_printf(MSG_DEBUG, "  * WANT_1X_4WAY_HS");
+                   if (nla_put_flag(msg, NL80211_ATTR_WANT_1X_4WAY_HS))
+                           return -1;
+           }
+
        /* Add PSK in case of 4-way handshake offload */
        if (params->psk &&
-           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE)) {
+           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK)) {
                wpa_hexdump_key(MSG_DEBUG, "  * PSK", params->psk, 32);
                if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk))
                        return -1;
@@ -5527,9 +5773,10 @@ skip_auth_type:
                goto fail;
 
        if (nl_connect)
-               ret = send_and_recv(drv->global, nl_connect, msg, NULL, NULL);
+               ret = send_and_recv(drv->global, nl_connect, msg,
+                                   NULL, (void *) -1);
        else
-               ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+               ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1);
 
        msg = NULL;
        if (ret) {
@@ -5541,6 +5788,7 @@ skip_auth_type:
        }
 
 fail:
+       nl80211_nlmsg_clear(msg);
        nlmsg_free(msg);
        return ret;
 
@@ -5571,7 +5819,7 @@ static int wpa_driver_nl80211_connect(
                           "disconnecting before reassociation "
                           "attempt");
                if (wpa_driver_nl80211_disconnect(
-                           drv, WLAN_REASON_PREV_AUTH_NOT_VALID))
+                           drv, WLAN_REASON_PREV_AUTH_NOT_VALID, nl_connect))
                        return -1;
                ret = wpa_driver_nl80211_try_connect(drv, params, nl_connect);
        }
@@ -5602,8 +5850,13 @@ static int wpa_driver_nl80211_associate(
 
                if (wpa_driver_nl80211_set_mode(priv, nlmode) < 0)
                        return -1;
-               if (params->auth_alg & WPA_AUTH_ALG_SAE)
+               if (params->auth_alg & WPA_AUTH_ALG_SAE) {
                        nl_connect = bss->nl_connect;
+                       bss->use_nl_connect = 1;
+               } else {
+                       bss->use_nl_connect = 0;
+               }
+
                return wpa_driver_nl80211_connect(drv, params, nl_connect);
        }
 
@@ -5936,6 +6189,7 @@ static int get_key_handler(struct nl_msg *msg, void *arg)
        if (tb[NL80211_ATTR_KEY_SEQ])
                memcpy(arg, nla_data(tb[NL80211_ATTR_KEY_SEQ]),
                       min_int(nla_len(tb[NL80211_ATTR_KEY_SEQ]), 6));
+       nl80211_nlmsg_clear(msg);
        return NL_SKIP;
 }
 
@@ -5970,7 +6224,7 @@ static int i802_set_rts(void *priv, int rts)
        int ret;
        u32 val;
 
-       if (rts >= 2347)
+       if (rts >= 2347 || rts == -1)
                val = (u32) -1;
        else
                val = rts;
@@ -5998,7 +6252,7 @@ static int i802_set_frag(void *priv, int frag)
        int ret;
        u32 val;
 
-       if (frag >= 2346)
+       if (frag >= 2346 || frag == -1)
                val = (u32) -1;
        else
                val = frag;
@@ -6040,6 +6294,36 @@ static int i802_flush(void *priv)
 }
 
 
+static void get_sta_tid_stats(struct hostap_sta_driver_data *data,
+                             struct nlattr *attr)
+{
+       struct nlattr *tid_stats[NL80211_TID_STATS_MAX + 1], *tidattr;
+       struct nlattr *txq_stats[NL80211_TXQ_STATS_MAX + 1];
+       static struct nla_policy txq_stats_policy[NL80211_TXQ_STATS_MAX + 1] = {
+               [NL80211_TXQ_STATS_BACKLOG_BYTES] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_BACKLOG_PACKETS] = { .type = NLA_U32 },
+       };
+       int rem;
+
+       nla_for_each_nested(tidattr, attr, rem) {
+               if (nla_parse_nested(tid_stats, NL80211_TID_STATS_MAX,
+                                    tidattr, NULL) != 0 ||
+                   !tid_stats[NL80211_TID_STATS_TXQ_STATS] ||
+                   nla_parse_nested(txq_stats, NL80211_TXQ_STATS_MAX,
+                                    tid_stats[NL80211_TID_STATS_TXQ_STATS],
+                                    txq_stats_policy) != 0)
+                       continue;
+               /* sum the backlogs over all TIDs for station */
+               if (txq_stats[NL80211_TXQ_STATS_BACKLOG_BYTES])
+                       data->backlog_bytes += nla_get_u32(
+                               txq_stats[NL80211_TXQ_STATS_BACKLOG_BYTES]);
+               if (txq_stats[NL80211_TXQ_STATS_BACKLOG_PACKETS])
+                       data->backlog_bytes += nla_get_u32(
+                               txq_stats[NL80211_TXQ_STATS_BACKLOG_PACKETS]);
+       }
+}
+
+
 static int get_sta_handler(struct nl_msg *msg, void *arg)
 {
        struct nlattr *tb[NL80211_ATTR_MAX + 1];
@@ -6057,6 +6341,8 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
                [NL80211_STA_INFO_TX_BYTES64] = { .type = NLA_U64 },
                [NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
                [NL80211_STA_INFO_ACK_SIGNAL] = { .type = NLA_U8 },
+               [NL80211_STA_INFO_RX_DURATION] = { .type = NLA_U64 },
+               [NL80211_STA_INFO_TX_DURATION] = { .type = NLA_U64 },
        };
        struct nlattr *rate[NL80211_RATE_INFO_MAX + 1];
        static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
@@ -6114,6 +6400,12 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
        if (stats[NL80211_STA_INFO_TX_PACKETS])
                data->tx_packets =
                        nla_get_u32(stats[NL80211_STA_INFO_TX_PACKETS]);
+       if (stats[NL80211_STA_INFO_RX_DURATION])
+               data->rx_airtime =
+                       nla_get_u64(stats[NL80211_STA_INFO_RX_DURATION]);
+       if (stats[NL80211_STA_INFO_TX_DURATION])
+               data->tx_airtime =
+                       nla_get_u64(stats[NL80211_STA_INFO_TX_DURATION]);
        if (stats[NL80211_STA_INFO_TX_FAILED])
                data->tx_retry_failed =
                        nla_get_u32(stats[NL80211_STA_INFO_TX_FAILED]);
@@ -6184,6 +6476,9 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
                }
        }
 
+       if (stats[NL80211_STA_INFO_TID_STATS])
+               get_sta_tid_stats(data, stats[NL80211_STA_INFO_TID_STATS]);
+
        return NL_SKIP;
 }
 
@@ -6210,6 +6505,7 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nlattr *txq, *params;
+       int res;
 
        msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_WIPHY);
        if (!msg)
@@ -6255,7 +6551,11 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
 
        nla_nest_end(msg, txq);
 
-       if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
+       res = send_and_recv_msgs(drv, msg, NULL, NULL);
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: TX queue param set: queue=%d aifs=%d cw_min=%d cw_max=%d burst_time=%d --> res=%d",
+                  queue, aifs, cw_min, cw_max, burst_time, res);
+       if (res == 0)
                return 0;
        msg = NULL;
 fail:
@@ -6319,7 +6619,7 @@ static int i802_sta_clear_stats(void *priv, const u8 *addr)
 
 
 static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
-                          int reason)
+                          u16 reason)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
@@ -6354,7 +6654,7 @@ static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
 
 
 static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
-                            int reason)
+                            u16 reason)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
@@ -6389,11 +6689,11 @@ static void dump_ifidx(struct wpa_driver_nl80211_data *drv)
        end = pos + sizeof(buf);
 
        for (i = 0; i < drv->num_if_indices; i++) {
-               if (!drv->if_indices[i])
+               if (!drv->if_indices[i].ifindex)
                        continue;
                res = os_snprintf(pos, end - pos, " %d(%d)",
-                                 drv->if_indices[i],
-                                 drv->if_indices_reason[i]);
+                                 drv->if_indices[i].ifindex,
+                                 drv->if_indices[i].reason);
                if (os_snprintf_error(end - pos, res))
                        break;
                pos += res;
@@ -6409,7 +6709,7 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
                      int ifidx_reason)
 {
        int i;
-       int *old, *old_reason;
+       struct drv_nl80211_if_info *old;
 
        wpa_printf(MSG_DEBUG,
                   "nl80211: Add own interface ifindex %d (ifidx_reason %d)",
@@ -6420,9 +6720,9 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
                return;
        }
        for (i = 0; i < drv->num_if_indices; i++) {
-               if (drv->if_indices[i] == 0) {
-                       drv->if_indices[i] = ifidx;
-                       drv->if_indices_reason[i] = ifidx_reason;
+               if (drv->if_indices[i].ifindex == 0) {
+                       drv->if_indices[i].ifindex = ifidx;
+                       drv->if_indices[i].reason = ifidx_reason;
                        dump_ifidx(drv);
                        return;
                }
@@ -6433,29 +6733,13 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
        else
                old = NULL;
 
-       if (drv->if_indices_reason != drv->default_if_indices_reason)
-               old_reason = drv->if_indices_reason;
-       else
-               old_reason = NULL;
-
        drv->if_indices = os_realloc_array(old, drv->num_if_indices + 1,
-                                          sizeof(int));
-       drv->if_indices_reason = os_realloc_array(old_reason,
-                                                 drv->num_if_indices + 1,
-                                                 sizeof(int));
+                                          sizeof(*old));
        if (!drv->if_indices) {
                if (!old)
                        drv->if_indices = drv->default_if_indices;
                else
                        drv->if_indices = old;
-       }
-       if (!drv->if_indices_reason) {
-               if (!old_reason)
-                       drv->if_indices_reason = drv->default_if_indices_reason;
-               else
-                       drv->if_indices_reason = old_reason;
-       }
-       if (!drv->if_indices || !drv->if_indices_reason) {
                wpa_printf(MSG_ERROR, "Failed to reallocate memory for "
                           "interfaces");
                wpa_printf(MSG_ERROR, "Ignoring EAPOL on interface %d", ifidx);
@@ -6464,12 +6748,8 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
        if (!old)
                os_memcpy(drv->if_indices, drv->default_if_indices,
                          sizeof(drv->default_if_indices));
-       if (!old_reason)
-               os_memcpy(drv->if_indices_reason,
-                         drv->default_if_indices_reason,
-                         sizeof(drv->default_if_indices_reason));
-       drv->if_indices[drv->num_if_indices] = ifidx;
-       drv->if_indices_reason[drv->num_if_indices] = ifidx_reason;
+       drv->if_indices[drv->num_if_indices].ifindex = ifidx;
+       drv->if_indices[drv->num_if_indices].reason = ifidx_reason;
        drv->num_if_indices++;
        dump_ifidx(drv);
 }
@@ -6481,10 +6761,12 @@ static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
        int i;
 
        for (i = 0; i < drv->num_if_indices; i++) {
-               if ((drv->if_indices[i] == ifidx || ifidx == IFIDX_ANY) &&
-                   (drv->if_indices_reason[i] == ifidx_reason ||
+               if ((drv->if_indices[i].ifindex == ifidx ||
+                    ifidx == IFIDX_ANY) &&
+                   (drv->if_indices[i].reason == ifidx_reason ||
                     ifidx_reason == IFIDX_ANY)) {
-                       drv->if_indices[i] = 0;
+                       drv->if_indices[i].ifindex = 0;
+                       drv->if_indices[i].reason = 0;
                        break;
                }
        }
@@ -6498,8 +6780,8 @@ static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
        int i;
 
        for (i = 0; i < drv->num_if_indices; i++)
-               if (drv->if_indices[i] == ifidx &&
-                   (drv->if_indices_reason[i] == ifidx_reason ||
+               if (drv->if_indices[i].ifindex == ifidx &&
+                   (drv->if_indices[i].reason == ifidx_reason ||
                     ifidx_reason == IFIDX_ANY))
                        return 1;
 
@@ -6514,8 +6796,15 @@ static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val,
        struct wpa_driver_nl80211_data *drv = bss->drv;
        char name[IFNAMSIZ + 1];
        union wpa_event_data event;
+       int ret;
+
+       ret = os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
+       if (ret >= (int) sizeof(name))
+               wpa_printf(MSG_WARNING,
+                          "nl80211: WDS interface name was truncated");
+       else if (ret < 0)
+               return ret;
 
-       os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
        if (ifname_wds)
                os_strlcpy(ifname_wds, name, IFNAMSIZ + 1);
 
@@ -6537,7 +6826,7 @@ static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val,
                        event.wds_sta_interface.sta_addr = addr;
                        event.wds_sta_interface.ifname = name;
                        event.wds_sta_interface.istatus = INTERFACE_ADDED;
-                       wpa_supplicant_event(drv->ctx,
+                       wpa_supplicant_event(bss->ctx,
                                             EVENT_WDS_STA_INTERFACE_STATUS,
                                             &event);
                }
@@ -6547,9 +6836,12 @@ static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val,
                }
                return i802_set_sta_vlan(priv, addr, name, 0);
        } else {
-               if (bridge_ifname)
-                       linux_br_del_if(drv->global->ioctl_sock, bridge_ifname,
-                                       name);
+               if (bridge_ifname &&
+                   linux_br_del_if(drv->global->ioctl_sock, bridge_ifname,
+                                   name) < 0)
+                       wpa_printf(MSG_INFO,
+                                  "nl80211: Failed to remove interface %s from bridge %s: %s",
+                                  name, bridge_ifname, strerror(errno));
 
                i802_set_sta_vlan(priv, addr, bss->ifname, 0);
                nl80211_remove_iface(drv, if_nametoindex(name));
@@ -6557,7 +6849,7 @@ static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val,
                event.wds_sta_interface.sta_addr = addr;
                event.wds_sta_interface.ifname = name;
                event.wds_sta_interface.istatus = INTERFACE_REMOVED;
-               wpa_supplicant_event(drv->ctx, EVENT_WDS_STA_INTERFACE_STATUS,
+               wpa_supplicant_event(bss->ctx, EVENT_WDS_STA_INTERFACE_STATUS,
                                     &event);
                return 0;
        }
@@ -7716,13 +8008,15 @@ static int nl80211_pmkid(struct i802_bss *bss, int cmd,
            (params->fils_cache_id &&
             nla_put(msg, NL80211_ATTR_FILS_CACHE_ID, 2,
                     params->fils_cache_id)) ||
-           (params->pmk_len && params->pmk_len <= PMK_MAX_LEN &&
+           (cmd != NL80211_CMD_DEL_PMKSA &&
+            params->pmk_len && params->pmk_len <= PMK_MAX_LEN &&
             nla_put(msg, NL80211_ATTR_PMK, params->pmk_len, params->pmk))) {
+               nl80211_nlmsg_clear(msg);
                nlmsg_free(msg);
                return -ENOBUFS;
        }
 
-       return send_and_recv_msgs(bss->drv, msg, NULL, NULL);
+       return send_and_recv_msgs(bss->drv, msg, NULL, (void *) -1);
 }
 
 
@@ -8045,6 +8339,7 @@ static void nl80211_poll_client(void *priv, const u8 *own_addr, const u8 *addr,
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
+       u64 cookie;
        int ret;
 
        if (!drv->poll_command_supported) {
@@ -8058,11 +8353,16 @@ static void nl80211_poll_client(void *priv, const u8 *own_addr, const u8 *addr,
                return;
        }
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie);
        if (ret < 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Client probe request for "
                           MACSTR " failed: ret=%d (%s)",
                           MAC2STR(addr), ret, strerror(-ret));
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Client probe request addr=" MACSTR
+                          " cookie=%llu", MAC2STR(addr),
+                          (long long unsigned int) cookie);
        }
 }
 
@@ -8123,8 +8423,8 @@ static int nl80211_start_radar_detection(void *priv,
        struct nl_msg *msg;
        int ret;
 
-       wpa_printf(MSG_DEBUG, "nl80211: Start radar detection (CAC) %d MHz (ht_enabled=%d, vht_enabled=%d, bandwidth=%d MHz, cf1=%d MHz, cf2=%d MHz)",
-                  freq->freq, freq->ht_enabled, freq->vht_enabled,
+       wpa_printf(MSG_DEBUG, "nl80211: Start radar detection (CAC) %d MHz (ht_enabled=%d, vht_enabled=%d, he_enabled=%d, bandwidth=%d MHz, cf1=%d MHz, cf2=%d MHz)",
+                  freq->freq, freq->ht_enabled, freq->vht_enabled, freq->he_enabled,
                   freq->bandwidth, freq->center_freq1, freq->center_freq2);
 
        if (!(drv->capa.flags & WPA_DRIVER_FLAGS_RADAR)) {
@@ -8336,7 +8636,7 @@ static int driver_nl80211_scan2(void *priv,
 
 
 static int driver_nl80211_deauthenticate(void *priv, const u8 *addr,
-                                        int reason_code)
+                                        u16 reason_code)
 {
        struct i802_bss *bss = priv;
        return wpa_driver_nl80211_deauthenticate(bss, addr, reason_code);
@@ -8451,6 +8751,35 @@ static int wpa_driver_nl80211_update_ft_ies(void *priv, const u8 *md,
 }
 
 
+static int nl80211_update_dh_ie(void *priv, const u8 *peer_mac,
+                               u16 reason_code, const u8 *ie, size_t ie_len)
+{
+       int ret;
+       struct nl_msg *msg;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       wpa_printf(MSG_DEBUG, "nl80211: Updating DH IE peer: " MACSTR
+                  " reason %u", MAC2STR(peer_mac), reason_code);
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_UPDATE_OWE_INFO)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer_mac) ||
+           nla_put_u16(msg, NL80211_ATTR_STATUS_CODE, reason_code) ||
+           (ie && nla_put(msg, NL80211_ATTR_IE, ie_len, ie))) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: update_dh_ie failed err=%d (%s)",
+                          ret, strerror(-ret));
+       }
+
+       return ret;
+}
+
+
 static const u8 * wpa_driver_nl80211_get_macaddr(void *priv)
 {
        struct i802_bss *bss = priv;
@@ -8494,6 +8823,8 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
        struct wpa_driver_nl80211_data *drv = bss->drv;
        int res;
        char *pos, *end;
+       struct nl_msg *msg;
+       char alpha2[3] = { 0, 0, 0 };
 
        pos = buf;
        end = buf + buflen;
@@ -8638,6 +8969,23 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                pos += res;
        }
 
+       msg = nlmsg_alloc();
+       if (msg &&
+           nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_REG) &&
+           nla_put_u32(msg, NL80211_ATTR_WIPHY, drv->wiphy_idx) == 0) {
+               if (send_and_recv_msgs(drv, msg, nl80211_get_country,
+                                      alpha2) == 0 &&
+                   alpha2[0]) {
+                       res = os_snprintf(pos, end - pos, "country=%s\n",
+                                         alpha2);
+                       if (os_snprintf_error(end - pos, res))
+                               return pos - buf;
+                       pos += res;
+               }
+       } else {
+               nlmsg_free(msg);
+       }
+
        return pos - buf;
 }
 
@@ -9204,8 +9552,8 @@ static int nl80211_put_mesh_id(struct nl_msg *msg, const u8 *mesh_id,
                               size_t mesh_id_len)
 {
        if (mesh_id) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * Mesh ID (SSID)",
-                                 mesh_id, mesh_id_len);
+               wpa_printf(MSG_DEBUG, "  * Mesh ID (SSID)=%s",
+                          wpa_ssid_txt(mesh_id, mesh_id_len));
                return nla_put(msg, NL80211_ATTR_MESH_ID, mesh_id_len, mesh_id);
        }
 
@@ -9380,6 +9728,36 @@ static int wpa_driver_nl80211_leave_mesh(void *priv)
        return ret;
 }
 
+
+static int nl80211_probe_mesh_link(void *priv, const u8 *addr, const u8 *eth,
+                                  size_t len)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       int ret;
+
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_PROBE_MESH_LINK);
+       if (!msg ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           nla_put(msg, NL80211_ATTR_FRAME, len, eth)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret) {
+               wpa_printf(MSG_DEBUG, "nl80211: mesh link probe to " MACSTR
+                          " failed: ret=%d (%s)",
+                          MAC2STR(addr), ret, strerror(-ret));
+       } else {
+               wpa_printf(MSG_DEBUG, "nl80211: Mesh link to " MACSTR
+                          " probed successfully", MAC2STR(addr));
+       }
+
+       return ret;
+}
+
 #endif /* CONFIG_MESH */
 
 
@@ -10368,22 +10746,37 @@ static int nl80211_write_to_file(const char *name, unsigned int val)
 {
        int fd, len;
        char tmp[128];
+       int ret = 0;
 
        fd = open(name, O_RDWR);
        if (fd < 0) {
-               wpa_printf(MSG_ERROR, "nl80211: Failed to open %s: %s",
+               int level;
+               /*
+                * Flags may not exist on older kernels, or while we're tearing
+                * down a disappearing device.
+                */
+               if (errno == ENOENT) {
+                       ret = 0;
+                       level = MSG_DEBUG;
+               } else {
+                       ret = -1;
+                       level = MSG_ERROR;
+               }
+               wpa_printf(level, "nl80211: Failed to open %s: %s",
                           name, strerror(errno));
-               return fd;
+               return ret;
        }
 
        len = os_snprintf(tmp, sizeof(tmp), "%u\n", val);
        len = write(fd, tmp, len);
-       if (len < 0)
+       if (len < 0) {
+               ret = -1;
                wpa_printf(MSG_ERROR, "nl80211: Failed to write to %s: %s",
                           name, strerror(errno));
+       }
        close(fd);
 
-       return 0;
+       return ret;
 }
 
 
@@ -10546,15 +10939,27 @@ static int nl80211_send_external_auth_status(void *priv,
        struct nl_msg *msg = NULL;
        int ret = -1;
 
+       /* External auth command/status is intended for drivers that implement
+        * intenral SME but want to offload authentication processing (e.g.,
+        * SAE) to hostapd/wpa_supplicant. Do nott send the status to drivers
+        * which do not support AP SME or use wpa_supplicant/hostapd SME.
+        */
+       if ((is_ap_interface(drv->nlmode) && !bss->drv->device_ap_sme) ||
+           (drv->capa.flags & WPA_DRIVER_FLAGS_SME))
+               return -1;
+
        wpa_dbg(drv->ctx, MSG_DEBUG,
                "nl80211: External auth status: %u", params->status);
 
        msg = nl80211_drv_msg(drv, 0, NL80211_CMD_EXTERNAL_AUTH);
        if (!msg ||
            nla_put_u16(msg, NL80211_ATTR_STATUS_CODE, params->status) ||
-           nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
-                   params->ssid) ||
-           nla_put(msg, NL80211_ATTR_BSSID, ETH_ALEN, params->bssid))
+           (params->ssid && params->ssid_len &&
+            nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid)) ||
+           (params->pmkid &&
+            nla_put(msg, NL80211_ATTR_PMKID, PMKID_LEN, params->pmkid)) ||
+           (params->bssid &&
+            nla_put(msg, NL80211_ATTR_BSSID, ETH_ALEN, params->bssid)))
                goto fail;
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        msg = NULL;
@@ -10570,6 +10975,49 @@ fail:
 }
 
 
+static int nl80211_set_4addr_mode(void *priv, const char *bridge_ifname,
+                                 int val)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       int ret = -ENOBUFS;
+
+       wpa_printf(MSG_DEBUG, "nl80211: %s 4addr mode (bridge_ifname: %s)",
+                  val ? "Enable" : "Disable", bridge_ifname);
+
+       msg = nl80211_cmd_msg(drv->first_bss, 0, NL80211_CMD_SET_INTERFACE);
+       if (!msg || nla_put_u8(msg, NL80211_ATTR_4ADDR, val))
+               goto fail;
+
+       if (bridge_ifname[0] && bss->added_if_into_bridge && !val) {
+               if (linux_br_del_if(drv->global->ioctl_sock,
+                                   bridge_ifname, bss->ifname)) {
+                       wpa_printf(MSG_ERROR,
+                                  "nl80211: Failed to remove interface %s from bridge %s",
+                                  bss->ifname, bridge_ifname);
+                       return -1;
+               }
+               bss->added_if_into_bridge = 0;
+       }
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       msg = NULL;
+       if (!ret) {
+               if (bridge_ifname[0] && val &&
+                   i802_check_bridge(drv, bss, bridge_ifname, bss->ifname) < 0)
+                       return -1;
+               return 0;
+       }
+
+fail:
+       nlmsg_free(msg);
+       wpa_printf(MSG_ERROR, "nl80211: Failed to enable/disable 4addr");
+
+       return ret;
+}
+
+
 const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .name = "nl80211",
        .desc = "Linux nl80211/cfg80211",
@@ -10603,6 +11051,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .sta_remove = driver_nl80211_sta_remove,
        .hapd_send_eapol = wpa_driver_nl80211_hapd_send_eapol,
        .sta_set_flags = wpa_driver_nl80211_sta_set_flags,
+       .sta_set_airtime_weight = driver_nl80211_sta_set_airtime_weight,
        .hapd_init = i802_init,
        .hapd_deinit = i802_deinit,
        .set_wds_sta = i802_set_wds_sta,
@@ -10629,6 +11078,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .resume = wpa_driver_nl80211_resume,
        .signal_monitor = nl80211_signal_monitor,
        .signal_poll = nl80211_signal_poll,
+       .channel_info = nl80211_channel_info,
        .send_frame = nl80211_send_frame,
        .set_param = nl80211_set_param,
        .get_radio_name = nl80211_get_radio_name,
@@ -10647,6 +11097,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .tdls_disable_channel_switch = nl80211_tdls_disable_channel_switch,
 #endif /* CONFIG_TDLS */
        .update_ft_ies = wpa_driver_nl80211_update_ft_ies,
+       .update_dh_ie = nl80211_update_dh_ie,
        .get_mac_addr = wpa_driver_nl80211_get_macaddr,
        .get_survey = wpa_driver_nl80211_get_survey,
        .status = wpa_driver_nl80211_status,
@@ -10669,6 +11120,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .init_mesh = wpa_driver_nl80211_init_mesh,
        .join_mesh = wpa_driver_nl80211_join_mesh,
        .leave_mesh = wpa_driver_nl80211_leave_mesh,
+       .probe_mesh_link = nl80211_probe_mesh_link,
 #endif /* CONFIG_MESH */
        .br_add_ip_neigh = wpa_driver_br_add_ip_neigh,
        .br_delete_ip_neigh = wpa_driver_br_delete_ip_neigh,
@@ -10698,4 +11150,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .get_ext_capab = nl80211_get_ext_capab,
        .update_connect_params = nl80211_update_connection_params,
        .send_external_auth_status = nl80211_send_external_auth_status,
+       .set_4addr_mode = nl80211_set_4addr_mode,
 };