mesh: Rename MPM FSM states to match the standard
[mech_eap.git] / src / drivers / driver_nl80211.c
index 00e6c0c..d3e4cfb 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Driver interaction with Linux nl80211/cfg80211
- * Copyright (c) 2002-2014, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2015, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2003-2004, Instant802 Networks, Inc.
  * Copyright (c) 2005-2006, Devicescape Software, Inc.
  * Copyright (c) 2007, Johannes Berg <johannes@sipsolutions.net>
@@ -87,7 +87,6 @@ static void nl80211_handle_destroy(struct nl_handle *handle)
 #undef nl_socket_set_nonblocking
 #define nl_socket_set_nonblocking(h) android_nl_socket_set_nonblocking(h)
 
-#define genl_ctrl_resolve android_genl_ctrl_resolve
 #endif /* ANDROID */
 
 
@@ -132,6 +131,22 @@ static void nl80211_register_eloop_read(struct nl_handle **handle,
                                        eloop_sock_handler handler,
                                        void *eloop_data)
 {
+#ifdef CONFIG_LIBNL20
+       /*
+        * libnl uses a pretty small buffer (32 kB that gets converted to 64 kB)
+        * by default. It is possible to hit that limit in some cases where
+        * operations are blocked, e.g., with a burst of Deauthentication frames
+        * to hostapd and STA entry deletion. Try to increase the buffer to make
+        * this less likely to occur.
+        */
+       if (nl_socket_set_buffer_size(*handle, 262144, 0) < 0) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Could not set nl_socket RX buffer size: %s",
+                          strerror(errno));
+               /* continue anyway with the default (smaller) buffer */
+       }
+#endif /* CONFIG_LIBNL20 */
+
        nl_socket_set_nonblocking(*handle);
        eloop_register_read_sock(nl_socket_get_fd(*handle), handler,
                                 eloop_data, *handle);
@@ -148,6 +163,7 @@ static void nl80211_destroy_eloop_handle(struct nl_handle **handle)
 
 
 static void nl80211_global_deinit(void *priv);
+static void nl80211_check_global(struct nl80211_global *global);
 
 static void wpa_driver_nl80211_deinit(struct i802_bss *bss);
 static int wpa_driver_nl80211_set_mode_ibss(struct i802_bss *bss,
@@ -155,36 +171,35 @@ static int wpa_driver_nl80211_set_mode_ibss(struct i802_bss *bss,
 
 static int
 wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *set_addr, int first);
-static int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *addr, int cmd, u16 reason_code,
-                                  int local_state_change);
+                                  const u8 *set_addr, int first,
+                                  const char *driver_params);
 static int nl80211_send_frame_cmd(struct i802_bss *bss,
                                  unsigned int freq, unsigned int wait,
                                  const u8 *buf, size_t buf_len, u64 *cookie,
-                                 int no_cck, int no_ack, int offchanok);
-static int nl80211_register_frame(struct i802_bss *bss,
-                                 struct nl_handle *hl_handle,
-                                 u16 type, const u8 *match, size_t match_len);
+                                 int no_cck, int no_ack, int offchanok,
+                                 const u16 *csa_offs, size_t csa_offs_len);
 static int wpa_driver_nl80211_probe_req_report(struct i802_bss *bss,
                                               int report);
 
-static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx);
-static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx);
-static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx);
-static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
-                                       enum wpa_driver_if_type type,
-                                       const char *ifname);
+#define IFIDX_ANY -1
+
+static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason);
+static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason);
+static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason);
 
 static int nl80211_set_channel(struct i802_bss *bss,
                               struct hostapd_freq_params *freq, int set_chan);
 static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
                                     int ifindex, int disabled);
 
-static int nl80211_leave_ibss(struct wpa_driver_nl80211_data *drv);
+static int nl80211_leave_ibss(struct wpa_driver_nl80211_data *drv,
+                             int reset_mode);
 
-static int i802_set_freq(void *priv, struct hostapd_freq_params *freq);
 static int i802_set_iface_flags(struct i802_bss *bss, int up);
+static int nl80211_set_param(void *priv, const char *param);
 
 
 /* Converts nl80211_chan_width to a common format */
@@ -215,7 +230,7 @@ int is_ap_interface(enum nl80211_iftype nlmode)
 }
 
 
-static int is_sta_interface(enum nl80211_iftype nlmode)
+int is_sta_interface(enum nl80211_iftype nlmode)
 {
        return nlmode == NL80211_IFTYPE_STATION ||
                nlmode == NL80211_IFTYPE_P2P_CLIENT;
@@ -258,17 +273,6 @@ void nl80211_mark_disconnected(struct wpa_driver_nl80211_data *drv)
 }
 
 
-struct nl80211_bss_info_arg {
-       struct wpa_driver_nl80211_data *drv;
-       struct wpa_scan_results *res;
-       unsigned int assoc_freq;
-       unsigned int ibss_freq;
-       u8 assoc_bssid[ETH_ALEN];
-};
-
-static int bss_info_handler(struct nl_msg *msg, void *arg);
-
-
 /* nl80211 code */
 static int ack_handler(struct nl_msg *msg, void *arg)
 {
@@ -299,6 +303,28 @@ static int no_seq_check(struct nl_msg *msg, void *arg)
 }
 
 
+static void nl80211_nlmsg_clear(struct nl_msg *msg)
+{
+       /*
+        * Clear nlmsg data, e.g., to make sure key material is not left in
+        * heap memory for unnecessarily long time.
+        */
+       if (msg) {
+               struct nlmsghdr *hdr = nlmsg_hdr(msg);
+               void *data = nlmsg_data(hdr);
+               /*
+                * This would use nlmsg_datalen() or the older nlmsg_len() if
+                * only libnl were to maintain a stable API.. Neither will work
+                * with all released versions, so just calculate the length
+                * here.
+                */
+               int len = hdr->nlmsg_len - NLMSG_HDRLEN;
+
+               os_memset(data, 0, len);
+       }
+}
+
+
 static int send_and_recv(struct nl80211_global *global,
                         struct nl_handle *nl_handle, struct nl_msg *msg,
                         int (*valid_handler)(struct nl_msg *, void *),
@@ -307,6 +333,9 @@ static int send_and_recv(struct nl80211_global *global,
        struct nl_cb *cb;
        int err = -ENOMEM;
 
+       if (!msg)
+               return -ENOMEM;
+
        cb = nl_cb_clone(global->nl_cb);
        if (!cb)
                goto out;
@@ -335,21 +364,13 @@ static int send_and_recv(struct nl80211_global *global,
        }
  out:
        nl_cb_put(cb);
+       if (!valid_handler && valid_data == (void *) -1)
+               nl80211_nlmsg_clear(msg);
        nlmsg_free(msg);
        return err;
 }
 
 
-static int send_and_recv_msgs_global(struct nl80211_global *global,
-                                    struct nl_msg *msg,
-                                    int (*valid_handler)(struct nl_msg *, void *),
-                                    void *valid_data)
-{
-       return send_and_recv(global, global->nl, msg, valid_handler,
-                            valid_data);
-}
-
-
 int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
                       struct nl_msg *msg,
                       int (*valid_handler)(struct nl_msg *, void *),
@@ -366,19 +387,6 @@ struct family_data {
 };
 
 
-int nl80211_set_iface_id(struct nl_msg *msg, struct i802_bss *bss)
-{
-       if (bss->wdev_id_set)
-               NLA_PUT_U64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
-       else
-               NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-       return 0;
-
-nla_put_failure:
-       return -1;
-}
-
-
 static int family_handler(struct nl_msg *msg, void *arg)
 {
        struct family_data *res = arg;
@@ -414,23 +422,22 @@ static int nl_get_multicast_id(struct nl80211_global *global,
                               const char *family, const char *group)
 {
        struct nl_msg *msg;
-       int ret = -1;
+       int ret;
        struct family_data res = { group, -ENOENT };
 
        msg = nlmsg_alloc();
        if (!msg)
                return -ENOMEM;
-       genlmsg_put(msg, 0, 0, genl_ctrl_resolve(global->nl, "nlctrl"),
-                   0, 0, CTRL_CMD_GETFAMILY, 0);
-       NLA_PUT_STRING(msg, CTRL_ATTR_FAMILY_NAME, family);
+       if (!genlmsg_put(msg, 0, 0, genl_ctrl_resolve(global->nl, "nlctrl"),
+                        0, 0, CTRL_CMD_GETFAMILY, 0) ||
+           nla_put_string(msg, CTRL_ATTR_FAMILY_NAME, family)) {
+               nlmsg_free(msg);
+               return -1;
+       }
 
-       ret = send_and_recv_msgs_global(global, msg, family_handler, &res);
-       msg = NULL;
+       ret = send_and_recv(global, global->nl, msg, family_handler, &res);
        if (ret == 0)
                ret = res.id;
-
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
@@ -438,11 +445,72 @@ nla_put_failure:
 void * nl80211_cmd(struct wpa_driver_nl80211_data *drv,
                   struct nl_msg *msg, int flags, uint8_t cmd)
 {
+       if (TEST_FAIL())
+               return NULL;
        return genlmsg_put(msg, 0, 0, drv->global->nl80211_id,
                           0, flags, cmd, 0);
 }
 
 
+static int nl80211_set_iface_id(struct nl_msg *msg, struct i802_bss *bss)
+{
+       if (bss->wdev_id_set)
+               return nla_put_u64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
+       return nla_put_u32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+}
+
+
+struct nl_msg * nl80211_cmd_msg(struct i802_bss *bss, int flags, uint8_t cmd)
+{
+       struct nl_msg *msg;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return NULL;
+
+       if (!nl80211_cmd(bss->drv, msg, flags, cmd) ||
+           nl80211_set_iface_id(msg, bss) < 0) {
+               nlmsg_free(msg);
+               return NULL;
+       }
+
+       return msg;
+}
+
+
+static struct nl_msg *
+nl80211_ifindex_msg(struct wpa_driver_nl80211_data *drv, int ifindex,
+                   int flags, uint8_t cmd)
+{
+       struct nl_msg *msg;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return NULL;
+
+       if (!nl80211_cmd(drv, msg, flags, cmd) ||
+           nla_put_u32(msg, NL80211_ATTR_IFINDEX, ifindex)) {
+               nlmsg_free(msg);
+               return NULL;
+       }
+
+       return msg;
+}
+
+
+struct nl_msg * nl80211_drv_msg(struct wpa_driver_nl80211_data *drv, int flags,
+                               uint8_t cmd)
+{
+       return nl80211_ifindex_msg(drv, drv->ifindex, flags, cmd);
+}
+
+
+struct nl_msg * nl80211_bss_msg(struct i802_bss *bss, int flags, uint8_t cmd)
+{
+       return nl80211_ifindex_msg(bss->drv, bss->ifindex, flags, cmd);
+}
+
+
 struct wiphy_idx_data {
        int wiphy_idx;
        enum nl80211_iftype nlmode;
@@ -481,20 +549,11 @@ int nl80211_get_wiphy_index(struct i802_bss *bss)
                .macaddr = NULL,
        };
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return NL80211_IFTYPE_UNSPECIFIED;
-
-       nl80211_cmd(bss->drv, msg, 0, NL80211_CMD_GET_INTERFACE);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
+               return -1;
 
        if (send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data) == 0)
                return data.wiphy_idx;
-       msg = NULL;
-nla_put_failure:
-       nlmsg_free(msg);
        return -1;
 }
 
@@ -507,20 +566,11 @@ static enum nl80211_iftype nl80211_get_ifmode(struct i802_bss *bss)
                .macaddr = NULL,
        };
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(bss->drv, msg, 0, NL80211_CMD_GET_INTERFACE);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
+               return NL80211_IFTYPE_UNSPECIFIED;
 
        if (send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data) == 0)
                return data.nlmode;
-       msg = NULL;
-nla_put_failure:
-       nlmsg_free(msg);
        return NL80211_IFTYPE_UNSPECIFIED;
 }
 
@@ -532,19 +582,10 @@ static int nl80211_get_macaddr(struct i802_bss *bss)
                .macaddr = bss->addr,
        };
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return NL80211_IFTYPE_UNSPECIFIED;
-
-       nl80211_cmd(bss->drv, msg, 0, NL80211_CMD_GET_INTERFACE);
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_GET_INTERFACE)))
+               return -1;
 
        return send_and_recv_msgs(bss->drv, msg, netdev_info_handler, &data);
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return NL80211_IFTYPE_UNSPECIFIED;
 }
 
 
@@ -552,27 +593,24 @@ static int nl80211_register_beacons(struct wpa_driver_nl80211_data *drv,
                                    struct nl80211_wiphy_data *w)
 {
        struct nl_msg *msg;
-       int ret = -1;
+       int ret;
 
        msg = nlmsg_alloc();
        if (!msg)
                return -1;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_REGISTER_BEACONS);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, w->wiphy_idx);
+       if (!nl80211_cmd(drv, msg, 0, NL80211_CMD_REGISTER_BEACONS) ||
+           nla_put_u32(msg, NL80211_ATTR_WIPHY, w->wiphy_idx)) {
+               nlmsg_free(msg);
+               return -1;
+       }
 
        ret = send_and_recv(drv->global, w->nl_beacons, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Register beacons command "
                           "failed: ret=%d (%s)",
                           ret, strerror(-ret));
-               goto nla_put_failure;
        }
-       ret = 0;
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
@@ -727,6 +765,15 @@ static void nl80211_put_wiphy_data_ap(struct i802_bss *bss)
 }
 
 
+static unsigned int nl80211_get_ifindex(void *priv)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       return drv->ifindex;
+}
+
+
 static int wpa_driver_nl80211_get_bssid(void *priv, u8 *bssid)
 {
        struct i802_bss *bss = priv;
@@ -750,11 +797,12 @@ static int wpa_driver_nl80211_get_ssid(void *priv, u8 *ssid)
 
 
 static void wpa_driver_nl80211_event_newlink(
-       struct wpa_driver_nl80211_data *drv, char *ifname)
+       struct nl80211_global *global, struct wpa_driver_nl80211_data *drv,
+       int ifindex, const char *ifname)
 {
        union wpa_event_data event;
 
-       if (os_strcmp(drv->first_bss->ifname, ifname) == 0) {
+       if (drv && os_strcmp(drv->first_bss->ifname, ifname) == 0) {
                if (if_nametoindex(drv->first_bss->ifname) == 0) {
                        wpa_printf(MSG_DEBUG, "nl80211: Interface %s does not exist - ignore RTM_NEWLINK",
                                   drv->first_bss->ifname);
@@ -768,19 +816,25 @@ static void wpa_driver_nl80211_event_newlink(
        }
 
        os_memset(&event, 0, sizeof(event));
+       event.interface_status.ifindex = ifindex;
        os_strlcpy(event.interface_status.ifname, ifname,
                   sizeof(event.interface_status.ifname));
        event.interface_status.ievent = EVENT_INTERFACE_ADDED;
-       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, &event);
+       if (drv)
+               wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, &event);
+       else
+               wpa_supplicant_event_global(global->ctx, EVENT_INTERFACE_STATUS,
+                                           &event);
 }
 
 
 static void wpa_driver_nl80211_event_dellink(
-       struct wpa_driver_nl80211_data *drv, char *ifname)
+       struct nl80211_global *global, struct wpa_driver_nl80211_data *drv,
+       int ifindex, const char *ifname)
 {
        union wpa_event_data event;
 
-       if (os_strcmp(drv->first_bss->ifname, ifname) == 0) {
+       if (drv && os_strcmp(drv->first_bss->ifname, ifname) == 0) {
                if (drv->if_removed) {
                        wpa_printf(MSG_DEBUG, "nl80211: if_removed already set - ignore RTM_DELLINK event for %s",
                                   ifname);
@@ -795,10 +849,15 @@ static void wpa_driver_nl80211_event_dellink(
        }
 
        os_memset(&event, 0, sizeof(event));
+       event.interface_status.ifindex = ifindex;
        os_strlcpy(event.interface_status.ifname, ifname,
                   sizeof(event.interface_status.ifname));
        event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
-       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, &event);
+       if (drv)
+               wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS, &event);
+       else
+               wpa_supplicant_event_global(global->ctx, EVENT_INTERFACE_STATUS,
+                                           &event);
 }
 
 
@@ -834,9 +893,10 @@ static int wpa_driver_nl80211_own_ifindex(struct wpa_driver_nl80211_data *drv,
                return 1;
 
        if (drv->if_removed && wpa_driver_nl80211_own_ifname(drv, buf, len)) {
+               nl80211_check_global(drv->global);
                wpa_printf(MSG_DEBUG, "nl80211: Update ifindex for a removed "
                           "interface");
-               wpa_driver_nl80211_finish_drv_init(drv, NULL, 0);
+               wpa_driver_nl80211_finish_drv_init(drv, NULL, 0, NULL);
                return 1;
        }
 
@@ -851,7 +911,7 @@ nl80211_find_drv(struct nl80211_global *global, int idx, u8 *buf, size_t len)
        dl_list_for_each(drv, &global->interfaces,
                         struct wpa_driver_nl80211_data, list) {
                if (wpa_driver_nl80211_own_ifindex(drv, idx, buf, len) ||
-                   have_ifidx(drv, idx))
+                   have_ifidx(drv, idx, IFIDX_ANY))
                        return drv;
        }
        return NULL;
@@ -871,13 +931,6 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
        char ifname[IFNAMSIZ + 1];
        char extra[100], *pos, *end;
 
-       drv = nl80211_find_drv(global, ifi->ifi_index, buf, len);
-       if (!drv) {
-               wpa_printf(MSG_DEBUG, "nl80211: Ignore RTM_NEWLINK event for foreign ifindex %d",
-                          ifi->ifi_index);
-               return;
-       }
-
        extra[0] = '\0';
        pos = extra;
        end = pos + sizeof(extra);
@@ -921,16 +974,26 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
                   (ifi->ifi_flags & IFF_LOWER_UP) ? "[LOWER_UP]" : "",
                   (ifi->ifi_flags & IFF_DORMANT) ? "[DORMANT]" : "");
 
+       drv = nl80211_find_drv(global, ifi->ifi_index, buf, len);
+       if (!drv)
+               goto event_newlink;
+
        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,
-                                  drv->first_bss->ifname) > 0) {
+                   linux_iface_up(drv->global->ioctl_sock, namebuf) > 0) {
                        wpa_printf(MSG_DEBUG, "nl80211: Ignore interface down "
                                   "event since interface %s is up", namebuf);
+                       drv->ignore_if_down_event = 0;
                        return;
                }
-               wpa_printf(MSG_DEBUG, "nl80211: Interface down");
-               if (drv->ignore_if_down_event) {
+               wpa_printf(MSG_DEBUG, "nl80211: Interface down (%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 down",
+                                  drv->first_bss->ifname);
+               } else if (drv->ignore_if_down_event) {
                        wpa_printf(MSG_DEBUG, "nl80211: Ignore interface down "
                                   "event generated by mode change");
                        drv->ignore_if_down_event = 0;
@@ -953,8 +1016,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
 
        if (drv->if_disabled && (ifi->ifi_flags & IFF_UP)) {
                if (if_indextoname(ifi->ifi_index, namebuf) &&
-                   linux_iface_up(drv->global->ioctl_sock,
-                                  drv->first_bss->ifname) == 0) {
+                   linux_iface_up(drv->global->ioctl_sock, namebuf) == 0) {
                        wpa_printf(MSG_DEBUG, "nl80211: Ignore interface up "
                                   "event since interface %s is down",
                                   namebuf);
@@ -1010,17 +1072,24 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
                                       -1, IF_OPER_UP);
        }
 
+event_newlink:
        if (ifname[0])
-               wpa_driver_nl80211_event_newlink(drv, ifname);
+               wpa_driver_nl80211_event_newlink(global, drv, ifi->ifi_index,
+                                                ifname);
 
-       if (ifi->ifi_family == AF_BRIDGE && brid) {
+       if (ifi->ifi_family == AF_BRIDGE && brid && drv) {
                struct i802_bss *bss;
 
                /* device has been added to bridge */
-               if_indextoname(brid, namebuf);
+               if (!if_indextoname(brid, namebuf)) {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Could not find bridge ifname for ifindex %u",
+                                  brid);
+                       return;
+               }
                wpa_printf(MSG_DEBUG, "nl80211: Add ifindex %u for bridge %s",
                           brid, namebuf);
-               add_ifidx(drv, brid);
+               add_ifidx(drv, brid, ifi->ifi_index);
 
                for (bss = drv->first_bss; bss; bss = bss->next) {
                        if (os_strcmp(ifname, bss->ifname) == 0) {
@@ -1044,13 +1113,6 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
        char ifname[IFNAMSIZ + 1];
        char extra[100], *pos, *end;
 
-       drv = nl80211_find_drv(global, ifi->ifi_index, buf, len);
-       if (!drv) {
-               wpa_printf(MSG_DEBUG, "nl80211: Ignore RTM_DELLINK event for foreign ifindex %d",
-                          ifi->ifi_index);
-               return;
-       }
-
        extra[0] = '\0';
        pos = extra;
        end = pos + sizeof(extra);
@@ -1091,17 +1153,27 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
                   (ifi->ifi_flags & IFF_LOWER_UP) ? "[LOWER_UP]" : "",
                   (ifi->ifi_flags & IFF_DORMANT) ? "[DORMANT]" : "");
 
-       if (ifname[0] && (ifi->ifi_family != AF_BRIDGE || !brid))
-               wpa_driver_nl80211_event_dellink(drv, ifname);
+       drv = nl80211_find_drv(global, ifi->ifi_index, buf, len);
 
-       if (ifi->ifi_family == AF_BRIDGE && brid) {
+       if (ifi->ifi_family == AF_BRIDGE && brid && drv) {
                /* device has been removed from bridge */
                char namebuf[IFNAMSIZ];
-               if_indextoname(brid, namebuf);
-               wpa_printf(MSG_DEBUG, "nl80211: Remove ifindex %u for bridge "
-                          "%s", brid, namebuf);
-               del_ifidx(drv, brid);
+
+               if (!if_indextoname(brid, namebuf)) {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Could not find bridge ifname for ifindex %u",
+                                  brid);
+               } else {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Remove ifindex %u for bridge %s",
+                                  brid, namebuf);
+               }
+               del_ifidx(drv, brid, ifi->ifi_index);
        }
+
+       if (ifi->ifi_family != AF_BRIDGE || !brid)
+               wpa_driver_nl80211_event_dellink(global, drv, ifi->ifi_index,
+                                                ifname);
 }
 
 
@@ -1111,17 +1183,10 @@ unsigned int nl80211_get_assoc_freq(struct wpa_driver_nl80211_data *drv)
        int ret;
        struct nl80211_bss_info_arg arg;
 
+       msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
        os_memset(&arg, 0, sizeof(arg));
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto nla_put_failure;
-
-       nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
        arg.drv = drv;
        ret = send_and_recv_msgs(drv, msg, bss_info_handler, &arg);
-       msg = NULL;
        if (ret == 0) {
                unsigned int freq = drv->nlmode == NL80211_IFTYPE_ADHOC ?
                        arg.ibss_freq : arg.assoc_freq;
@@ -1133,8 +1198,6 @@ unsigned int nl80211_get_assoc_freq(struct wpa_driver_nl80211_data *drv)
        }
        wpa_printf(MSG_DEBUG, "nl80211: Scan result fetch failed: ret=%d "
                   "(%s)", ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
        return drv->assoc_freq;
 }
 
@@ -1147,6 +1210,7 @@ static int get_link_signal(struct nl_msg *msg, void *arg)
        static struct nla_policy policy[NL80211_STA_INFO_MAX + 1] = {
                [NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
                [NL80211_STA_INFO_SIGNAL_AVG] = { .type = NLA_U8 },
+               [NL80211_STA_INFO_BEACON_SIGNAL_AVG] = { .type = NLA_U8 },
        };
        struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
        static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
@@ -1175,6 +1239,13 @@ static int get_link_signal(struct nl_msg *msg, void *arg)
        else
                sig_change->avg_signal = 0;
 
+       if (sinfo[NL80211_STA_INFO_BEACON_SIGNAL_AVG])
+               sig_change->avg_beacon_signal =
+                       (s8)
+                       nla_get_u8(sinfo[NL80211_STA_INFO_BEACON_SIGNAL_AVG]);
+       else
+               sig_change->avg_beacon_signal = 0;
+
        if (sinfo[NL80211_STA_INFO_TX_BITRATE]) {
                if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,
                                     sinfo[NL80211_STA_INFO_TX_BITRATE],
@@ -1201,19 +1272,13 @@ int nl80211_get_link_signal(struct wpa_driver_nl80211_data *drv,
        sig->current_signal = -9999;
        sig->current_txrate = 0;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, drv->bssid);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, drv->bssid)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        return send_and_recv_msgs(drv, msg, get_link_signal, sig);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -1269,93 +1334,8 @@ int nl80211_get_link_noise(struct wpa_driver_nl80211_data *drv,
        sig_change->current_noise = 9999;
        sig_change->frequency = drv->assoc_freq;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
+       msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
        return send_and_recv_msgs(drv, msg, get_link_noise, sig_change);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
-}
-
-
-static int get_noise_for_scan_results(struct nl_msg *msg, void *arg)
-{
-       struct nlattr *tb[NL80211_ATTR_MAX + 1];
-       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-       struct nlattr *sinfo[NL80211_SURVEY_INFO_MAX + 1];
-       static struct nla_policy survey_policy[NL80211_SURVEY_INFO_MAX + 1] = {
-               [NL80211_SURVEY_INFO_FREQUENCY] = { .type = NLA_U32 },
-               [NL80211_SURVEY_INFO_NOISE] = { .type = NLA_U8 },
-       };
-       struct wpa_scan_results *scan_results = arg;
-       struct wpa_scan_res *scan_res;
-       size_t i;
-
-       nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
-                 genlmsg_attrlen(gnlh, 0), NULL);
-
-       if (!tb[NL80211_ATTR_SURVEY_INFO]) {
-               wpa_printf(MSG_DEBUG, "nl80211: Survey data missing");
-               return NL_SKIP;
-       }
-
-       if (nla_parse_nested(sinfo, NL80211_SURVEY_INFO_MAX,
-                            tb[NL80211_ATTR_SURVEY_INFO],
-                            survey_policy)) {
-               wpa_printf(MSG_DEBUG, "nl80211: Failed to parse nested "
-                          "attributes");
-               return NL_SKIP;
-       }
-
-       if (!sinfo[NL80211_SURVEY_INFO_NOISE])
-               return NL_SKIP;
-
-       if (!sinfo[NL80211_SURVEY_INFO_FREQUENCY])
-               return NL_SKIP;
-
-       for (i = 0; i < scan_results->num; ++i) {
-               scan_res = scan_results->res[i];
-               if (!scan_res)
-                       continue;
-               if ((int) nla_get_u32(sinfo[NL80211_SURVEY_INFO_FREQUENCY]) !=
-                   scan_res->freq)
-                       continue;
-               if (!(scan_res->flags & WPA_SCAN_NOISE_INVALID))
-                       continue;
-               scan_res->noise = (s8)
-                       nla_get_u8(sinfo[NL80211_SURVEY_INFO_NOISE]);
-               scan_res->flags &= ~WPA_SCAN_NOISE_INVALID;
-       }
-
-       return NL_SKIP;
-}
-
-
-static int nl80211_get_noise_for_scan_results(
-       struct wpa_driver_nl80211_data *drv,
-       struct wpa_scan_results *scan_res)
-{
-       struct nl_msg *msg;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       return send_and_recv_msgs(drv, msg, get_noise_for_scan_results,
-                                 scan_res);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -1399,15 +1379,14 @@ static int wpa_driver_nl80211_set_country(void *priv, const char *alpha2_arg)
        alpha2[1] = alpha2_arg[1];
        alpha2[2] = '\0';
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_REQ_SET_REG);
-
-       NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2, alpha2);
+       if (!nl80211_cmd(drv, msg, 0, NL80211_CMD_REQ_SET_REG) ||
+           nla_put_string(msg, NL80211_ATTR_REG_ALPHA2, alpha2)) {
+               nlmsg_free(msg);
+               return -EINVAL;
+       }
        if (send_and_recv_msgs(drv, msg, NULL, NULL))
                return -EINVAL;
        return 0;
-nla_put_failure:
-       nlmsg_free(msg);
-       return -EINVAL;
 }
 
 
@@ -1535,30 +1514,45 @@ err:
 }
 
 
-static int wpa_driver_nl80211_init_nl(struct wpa_driver_nl80211_data *drv)
+static void nl80211_check_global(struct nl80211_global *global)
 {
-       drv->nl_cb = nl_cb_alloc(NL_CB_DEFAULT);
-       if (!drv->nl_cb) {
-               wpa_printf(MSG_ERROR, "nl80211: Failed to alloc cb struct");
-               return -1;
+       struct nl_handle *handle;
+       const char *groups[] = { "scan", "mlme", "regulatory", "vendor", NULL };
+       int ret;
+       unsigned int i;
+
+       /*
+        * Try to re-add memberships to handle case of cfg80211 getting reloaded
+        * and all registration having been cleared.
+        */
+       handle = (void *) (((intptr_t) global->nl_event) ^
+                          ELOOP_SOCKET_INVALID);
+
+       for (i = 0; groups[i]; i++) {
+               ret = nl_get_multicast_id(global, "nl80211", groups[i]);
+               if (ret >= 0)
+                       ret = nl_socket_add_membership(handle, ret);
+               if (ret < 0) {
+                       wpa_printf(MSG_INFO,
+                                  "nl80211: Could not re-add multicast membership for %s events: %d (%s)",
+                                  groups[i], ret, strerror(-ret));
+               }
        }
-
-       nl_cb_set(drv->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
-                 no_seq_check, NULL);
-       nl_cb_set(drv->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
-                 process_drv_event, drv);
-
-       return 0;
-}
+}
 
 
 static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
 {
+       struct wpa_driver_nl80211_data *drv = ctx;
+
        wpa_printf(MSG_DEBUG, "nl80211: RFKILL blocked");
+
        /*
-        * This may be for any interface; use ifdown event to disable
-        * interface.
+        * rtnetlink ifdown handler will report interfaces other than the P2P
+        * Device interface as disabled.
         */
+       if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
+               wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED, NULL);
 }
 
 
@@ -1571,7 +1565,16 @@ static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
                           "after rfkill unblock");
                return;
        }
-       /* rtnetlink ifup handler will report interface as enabled */
+
+       if (is_p2p_net_interface(drv->nlmode))
+               nl80211_disable_11b_rates(drv, drv->ifindex, 1);
+
+       /*
+        * rtnetlink ifup handler will report interfaces other than the P2P
+        * Device interface as enabled.
+        */
+       if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
+               wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, NULL);
 }
 
 
@@ -1656,12 +1659,65 @@ static void nl80211_destroy_bss(struct i802_bss *bss)
 }
 
 
+static void
+wpa_driver_nl80211_drv_init_rfkill(struct wpa_driver_nl80211_data *drv)
+{
+       struct rfkill_config *rcfg;
+
+       if (drv->rfkill)
+               return;
+
+       rcfg = os_zalloc(sizeof(*rcfg));
+       if (!rcfg)
+               return;
+
+       rcfg->ctx = drv;
+
+       /* rfkill uses netdev sysfs for initialization. However, P2P Device is
+        * not associated with a netdev, so use the name of some other interface
+        * sharing the same wiphy as the P2P Device interface.
+        *
+        * Note: This is valid, as a P2P Device interface is always dynamically
+        * created and is created only once another wpa_s interface was added.
+        */
+       if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE) {
+               struct nl80211_global *global = drv->global;
+               struct wpa_driver_nl80211_data *tmp1;
+
+               dl_list_for_each(tmp1, &global->interfaces,
+                                struct wpa_driver_nl80211_data, list) {
+                       if (drv == tmp1 || drv->wiphy_idx != tmp1->wiphy_idx ||
+                           !tmp1->rfkill)
+                               continue;
+
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Use (%s) to initialize P2P Device rfkill",
+                                  tmp1->first_bss->ifname);
+                       os_strlcpy(rcfg->ifname, tmp1->first_bss->ifname,
+                                  sizeof(rcfg->ifname));
+                       break;
+               }
+       } else {
+               os_strlcpy(rcfg->ifname, drv->first_bss->ifname,
+                          sizeof(rcfg->ifname));
+       }
+
+       rcfg->blocked_cb = wpa_driver_nl80211_rfkill_blocked;
+       rcfg->unblocked_cb = wpa_driver_nl80211_rfkill_unblocked;
+       drv->rfkill = rfkill_init(rcfg);
+       if (!drv->rfkill) {
+               wpa_printf(MSG_DEBUG, "nl80211: RFKILL status not available");
+               os_free(rcfg);
+       }
+}
+
+
 static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
                                          void *global_priv, int hostapd,
-                                         const u8 *set_addr)
+                                         const u8 *set_addr,
+                                         const char *driver_params)
 {
        struct wpa_driver_nl80211_data *drv;
-       struct rfkill_config *rcfg;
        struct i802_bss *bss;
 
        if (global_priv == NULL)
@@ -1673,8 +1729,17 @@ static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
        drv->ctx = ctx;
        drv->hostapd = !!hostapd;
        drv->eapol_sock = -1;
+
+       /*
+        * There is no driver capability flag for this, so assume it is
+        * supported and disable this on first attempt to use if the driver
+        * rejects the command due to missing support.
+        */
+       drv->set_rekey_offload = 1;
+
        drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
        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) {
@@ -1691,31 +1756,10 @@ static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
        drv->eapol_tx_sock = -1;
        drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
 
-       if (wpa_driver_nl80211_init_nl(drv)) {
-               os_free(drv);
-               return NULL;
-       }
-
        if (nl80211_init_bss(bss))
                goto failed;
 
-       rcfg = os_zalloc(sizeof(*rcfg));
-       if (rcfg == NULL)
-               goto failed;
-       rcfg->ctx = drv;
-       os_strlcpy(rcfg->ifname, ifname, sizeof(rcfg->ifname));
-       rcfg->blocked_cb = wpa_driver_nl80211_rfkill_blocked;
-       rcfg->unblocked_cb = wpa_driver_nl80211_rfkill_unblocked;
-       drv->rfkill = rfkill_init(rcfg);
-       if (drv->rfkill == NULL) {
-               wpa_printf(MSG_DEBUG, "nl80211: RFKILL status not available");
-               os_free(rcfg);
-       }
-
-       if (linux_iface_up(drv->global->ioctl_sock, ifname) > 0)
-               drv->start_iface_up = 1;
-
-       if (wpa_driver_nl80211_finish_drv_init(drv, set_addr, 1))
+       if (wpa_driver_nl80211_finish_drv_init(drv, set_addr, 1, driver_params))
                goto failed;
 
        drv->eapol_tx_sock = socket(PF_PACKET, SOCK_DGRAM, 0);
@@ -1741,6 +1785,7 @@ static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
        }
 
        if (drv->global) {
+               nl80211_check_global(drv->global);
                dl_list_add(&drv->global->interfaces, &drv->list);
                drv->in_interface_list = 1;
        }
@@ -1764,7 +1809,8 @@ failed:
 static void * wpa_driver_nl80211_init(void *ctx, const char *ifname,
                                      void *global_priv)
 {
-       return wpa_driver_nl80211_drv_init(ctx, ifname, global_priv, 0, NULL);
+       return wpa_driver_nl80211_drv_init(ctx, ifname, global_priv, 0, NULL,
+                                          NULL);
 }
 
 
@@ -1774,54 +1820,42 @@ static int nl80211_register_frame(struct i802_bss *bss,
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -1;
+       int ret;
        char buf[30];
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
        buf[0] = '\0';
        wpa_snprintf_hex(buf, sizeof(buf), match, match_len);
        wpa_printf(MSG_DEBUG, "nl80211: Register frame type=0x%x (%s) nl_handle=%p match=%s",
                   type, fc2str(type), nl_handle, buf);
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_REGISTER_ACTION);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-
-       NLA_PUT_U16(msg, NL80211_ATTR_FRAME_TYPE, type);
-       NLA_PUT(msg, NL80211_ATTR_FRAME_MATCH, match_len, match);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_REGISTER_ACTION)) ||
+           nla_put_u16(msg, NL80211_ATTR_FRAME_TYPE, type) ||
+           nla_put(msg, NL80211_ATTR_FRAME_MATCH, match_len, match)) {
+               nlmsg_free(msg);
+               return -1;
+       }
 
        ret = send_and_recv(drv->global, nl_handle, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Register frame command "
                           "failed (type=%u): ret=%d (%s)",
                           type, ret, strerror(-ret));
                wpa_hexdump(MSG_DEBUG, "nl80211: Register frame match",
                            match, match_len);
-               goto nla_put_failure;
        }
-       ret = 0;
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
 
 static int nl80211_alloc_mgmt_handle(struct i802_bss *bss)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-
        if (bss->nl_mgmt) {
                wpa_printf(MSG_DEBUG, "nl80211: Mgmt reporting "
                           "already on! (nl_mgmt=%p)", bss->nl_mgmt);
                return -1;
        }
 
-       bss->nl_mgmt = nl_create_handle(drv->nl_cb, "mgmt");
+       bss->nl_mgmt = nl_create_handle(bss->nl_cb, "mgmt");
        if (bss->nl_mgmt == NULL)
                return -1;
 
@@ -1919,6 +1953,11 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
                        ret = -1;
        }
 #endif /* CONFIG_TDLS */
+#ifdef CONFIG_FST
+       /* FST Action frames */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x12", 1) < 0)
+               ret = -1;
+#endif /* CONFIG_FST */
 
        /* FT Action frames */
        if (nl80211_register_action_frame(bss, (u8 *) "\x06", 1) < 0)
@@ -1942,16 +1981,20 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
 
        /* WMM-AC ADDTS Response */
        if (nl80211_register_action_frame(bss, (u8 *) "\x11\x01", 2) < 0)
-               return -1;
+               ret = -1;
 
        /* WMM-AC DELTS */
        if (nl80211_register_action_frame(bss, (u8 *) "\x11\x02", 2) < 0)
-               return -1;
+               ret = -1;
 
        /* Radio Measurement - Neighbor Report Response */
        if (nl80211_register_action_frame(bss, (u8 *) "\x05\x05", 2) < 0)
                ret = -1;
 
+       /* Radio Measurement - Radio Measurement Request */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x05\x00", 2) < 0)
+               ret = -1;
+
        /* Radio Measurement - Link Measurement Request */
        if ((drv->capa.rrm_flags & WPA_DRIVER_FLAGS_TX_POWER_INSERTION) &&
            (nl80211_register_action_frame(bss, (u8 *) "\x05\x02", 2) < 0))
@@ -1999,29 +2042,59 @@ static int nl80211_mgmt_subscribe_mesh(struct i802_bss *bss)
 
 static int nl80211_register_spurious_class3(struct i802_bss *bss)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -1;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_UNEXPECTED_FRAME);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+       int ret;
 
-       ret = send_and_recv(drv->global, bss->nl_mgmt, msg, NULL, NULL);
-       msg = NULL;
+       msg = nl80211_bss_msg(bss, 0, NL80211_CMD_UNEXPECTED_FRAME);
+       ret = send_and_recv(bss->drv->global, bss->nl_mgmt, msg, NULL, NULL);
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Register spurious class3 "
                           "failed: ret=%d (%s)",
                           ret, strerror(-ret));
-               goto nla_put_failure;
        }
-       ret = 0;
-nla_put_failure:
-       nlmsg_free(msg);
+       return ret;
+}
+
+
+static int nl80211_action_subscribe_ap(struct i802_bss *bss)
+{
+       int ret = 0;
+
+       /* Public Action frames */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x04", 1) < 0)
+               ret = -1;
+       /* RRM Measurement Report */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x05\x01", 2) < 0)
+               ret = -1;
+       /* RRM Neighbor Report Request */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x05\x04", 2) < 0)
+               ret = -1;
+       /* FT Action frames */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x06", 1) < 0)
+               ret = -1;
+#ifdef CONFIG_IEEE80211W
+       /* SA Query */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x08", 1) < 0)
+               ret = -1;
+#endif /* CONFIG_IEEE80211W */
+       /* Protected Dual of Public Action */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x09", 1) < 0)
+               ret = -1;
+       /* WNM */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x0a", 1) < 0)
+               ret = -1;
+       /* WMM */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x11", 1) < 0)
+               ret = -1;
+#ifdef CONFIG_FST
+       /* FST Action frames */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x12", 1) < 0)
+               ret = -1;
+#endif /* CONFIG_FST */
+       /* Vendor-specific */
+       if (nl80211_register_action_frame(bss, (u8 *) "\x7f", 1) < 0)
+               ret = -1;
+
        return ret;
 }
 
@@ -2034,7 +2107,6 @@ static int nl80211_mgmt_subscribe_ap(struct i802_bss *bss)
                WLAN_FC_STYPE_REASSOC_REQ,
                WLAN_FC_STYPE_DISASSOC,
                WLAN_FC_STYPE_DEAUTH,
-               WLAN_FC_STYPE_ACTION,
                WLAN_FC_STYPE_PROBE_REQ,
 /* Beacon doesn't work as mac80211 doesn't currently allow
  * it, but it wouldn't really be the right thing anyway as
@@ -2059,6 +2131,9 @@ static int nl80211_mgmt_subscribe_ap(struct i802_bss *bss)
                }
        }
 
+       if (nl80211_action_subscribe_ap(bss))
+               goto out_err;
+
        if (nl80211_register_spurious_class3(bss))
                goto out_err;
 
@@ -2081,10 +2156,7 @@ static int nl80211_mgmt_subscribe_ap_dev_sme(struct i802_bss *bss)
        wpa_printf(MSG_DEBUG, "nl80211: Subscribe to mgmt frames with AP "
                   "handle %p (device SME)", bss->nl_mgmt);
 
-       if (nl80211_register_frame(bss, bss->nl_mgmt,
-                                  (WLAN_FC_TYPE_MGMT << 2) |
-                                  (WLAN_FC_STYPE_ACTION << 4),
-                                  NULL, 0) < 0)
+       if (nl80211_action_subscribe_ap(bss))
                goto out_err;
 
        nl80211_mgmt_handle_register_eloop(bss);
@@ -2116,56 +2188,31 @@ static void wpa_driver_nl80211_send_rfkill(void *eloop_ctx, void *timeout_ctx)
 
 static void nl80211_del_p2pdev(struct i802_bss *bss)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_INTERFACE);
-       NLA_PUT_U64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
-
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
+       msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_DEL_INTERFACE);
+       ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL);
 
        wpa_printf(MSG_DEBUG, "nl80211: Delete P2P Device %s (0x%llx): %s",
                   bss->ifname, (long long unsigned int) bss->wdev_id,
                   strerror(-ret));
-
-nla_put_failure:
-       nlmsg_free(msg);
 }
 
 
 static int nl80211_set_p2pdev(struct i802_bss *bss, int start)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -1;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       if (start)
-               nl80211_cmd(drv, msg, 0, NL80211_CMD_START_P2P_DEVICE);
-       else
-               nl80211_cmd(drv, msg, 0, NL80211_CMD_STOP_P2P_DEVICE);
-
-       NLA_PUT_U64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
+       int ret;
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
+       msg = nl80211_cmd_msg(bss, 0, start ? NL80211_CMD_START_P2P_DEVICE :
+                             NL80211_CMD_STOP_P2P_DEVICE);
+       ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL);
 
        wpa_printf(MSG_DEBUG, "nl80211: %s P2P Device %s (0x%llx): %s",
                   start ? "Start" : "Stop",
                   bss->ifname, (long long unsigned int) bss->wdev_id,
                   strerror(-ret));
-
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
@@ -2185,9 +2232,64 @@ static int i802_set_iface_flags(struct i802_bss *bss, int up)
 }
 
 
+#ifdef CONFIG_TESTING_OPTIONS
+static int qca_vendor_test_cmd_handler(struct nl_msg *msg, void *arg)
+{
+       /* struct wpa_driver_nl80211_data *drv = arg; */
+       struct nlattr *tb[NL80211_ATTR_MAX + 1];
+       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+
+
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: QCA vendor test command response received");
+
+       nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
+                 genlmsg_attrlen(gnlh, 0), NULL);
+       if (!tb[NL80211_ATTR_VENDOR_DATA]) {
+               wpa_printf(MSG_DEBUG, "nl80211: No vendor data attribute");
+               return NL_SKIP;
+       }
+
+       wpa_hexdump(MSG_DEBUG,
+                   "nl80211: Received QCA vendor test command response",
+                   nla_data(tb[NL80211_ATTR_VENDOR_DATA]),
+                   nla_len(tb[NL80211_ATTR_VENDOR_DATA]));
+
+       return NL_SKIP;
+}
+#endif /* CONFIG_TESTING_OPTIONS */
+
+
+static void qca_vendor_test(struct wpa_driver_nl80211_data *drv)
+{
+#ifdef CONFIG_TESTING_OPTIONS
+       struct nl_msg *msg;
+       struct nlattr *params;
+       int ret;
+
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_TEST) ||
+           !(params = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u32(msg, QCA_WLAN_VENDOR_ATTR_TEST, 123)) {
+               nlmsg_free(msg);
+               return;
+       }
+       nla_nest_end(msg, params);
+
+       ret = send_and_recv_msgs(drv, msg, qca_vendor_test_cmd_handler, drv);
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: QCA vendor test command returned %d (%s)",
+                  ret, strerror(-ret));
+#endif /* CONFIG_TESTING_OPTIONS */
+}
+
+
 static int
 wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *set_addr, int first)
+                                  const u8 *set_addr, int first,
+                                  const char *driver_params)
 {
        struct i802_bss *bss = drv->first_bss;
        int send_rfkill_event = 0;
@@ -2205,9 +2307,17 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
        if (!bss->if_dynamic && nl80211_get_ifmode(bss) == NL80211_IFTYPE_AP)
                bss->static_ap = 1;
 
+       if (first &&
+           nl80211_get_ifmode(bss) != NL80211_IFTYPE_P2P_DEVICE &&
+           linux_iface_up(drv->global->ioctl_sock, bss->ifname) > 0)
+               drv->start_iface_up = 1;
+
        if (wpa_driver_nl80211_capa(drv))
                return -1;
 
+       if (driver_params && nl80211_set_param(bss, driver_params) < 0)
+               return -1;
+
        wpa_printf(MSG_DEBUG, "nl80211: interface %s in phy %s",
                   bss->ifname, drv->phyname);
 
@@ -2235,6 +2345,8 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
        if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
                nl80211_get_macaddr(bss);
 
+       wpa_driver_nl80211_drv_init_rfkill(drv);
+
        if (!rfkill_is_blocked(drv->rfkill)) {
                int ret = i802_set_iface_flags(bss, 1);
                if (ret) {
@@ -2242,31 +2354,41 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
                                   "interface '%s' UP", bss->ifname);
                        return ret;
                }
+
+               if (is_p2p_net_interface(nlmode))
+                       nl80211_disable_11b_rates(bss->drv,
+                                                 bss->drv->ifindex, 1);
+
                if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
                        return ret;
        } else {
                wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable "
                           "interface '%s' due to rfkill", bss->ifname);
-               if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
-                       return 0;
-               drv->if_disabled = 1;
+               if (nlmode != NL80211_IFTYPE_P2P_DEVICE)
+                       drv->if_disabled = 1;
+
                send_rfkill_event = 1;
        }
 
-       if (!drv->hostapd)
+       if (!drv->hostapd && nlmode != NL80211_IFTYPE_P2P_DEVICE)
                netlink_send_oper_ifla(drv->global->netlink, drv->ifindex,
                                       1, IF_OPER_DORMANT);
 
-       if (linux_get_ifhwaddr(drv->global->ioctl_sock, bss->ifname,
-                              bss->addr))
-               return -1;
-       os_memcpy(drv->perm_addr, bss->addr, ETH_ALEN);
+       if (nlmode != NL80211_IFTYPE_P2P_DEVICE) {
+               if (linux_get_ifhwaddr(drv->global->ioctl_sock, bss->ifname,
+                                      bss->addr))
+                       return -1;
+               os_memcpy(drv->perm_addr, bss->addr, ETH_ALEN);
+       }
 
        if (send_rfkill_event) {
                eloop_register_timeout(0, 0, wpa_driver_nl80211_send_rfkill,
                                       drv, drv->ctx);
        }
 
+       if (drv->vendor_cmd_test_avail)
+               qca_vendor_test(drv);
+
        return 0;
 }
 
@@ -2275,19 +2397,10 @@ static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
 {
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
                   drv->ifindex);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_BEACON);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
        return send_and_recv_msgs(drv, msg, NULL, NULL);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -2301,6 +2414,10 @@ static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
 static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
+       unsigned int i;
+
+       wpa_printf(MSG_INFO, "nl80211: deinit ifname=%s disabled_11b_rates=%d",
+                  bss->ifname, drv->disabled_11b_rates);
 
        bss->in_deinit = 1;
        if (drv->data_tx_status)
@@ -2320,6 +2437,11 @@ static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
                        nl80211_handle_destroy(drv->rtnl_sk);
        }
        if (bss->added_bridge) {
+               if (linux_set_iface_flags(drv->global->ioctl_sock, bss->brname,
+                                         0) < 0)
+                       wpa_printf(MSG_INFO,
+                                  "nl80211: Could not set bridge %s down",
+                                  bss->brname);
                if (linux_br_del(drv->global->ioctl_sock, bss->brname) < 0)
                        wpa_printf(MSG_INFO, "nl80211: Failed to remove "
                                   "bridge %s: %s",
@@ -2339,6 +2461,9 @@ 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);
 
@@ -2374,7 +2499,6 @@ static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
                nl80211_mgmt_unsubscribe(bss, "deinit");
                nl80211_del_p2pdev(bss);
        }
-       nl_cb_put(drv->nl_cb);
 
        nl80211_destroy_bss(drv->first_bss);
 
@@ -2387,768 +2511,58 @@ static void wpa_driver_nl80211_deinit(struct i802_bss *bss)
 
        os_free(drv->extended_capa);
        os_free(drv->extended_capa_mask);
+       for (i = 0; i < drv->num_iface_ext_capa; i++) {
+               os_free(drv->iface_ext_capa[i].ext_capa);
+               os_free(drv->iface_ext_capa[i].ext_capa_mask);
+       }
        os_free(drv->first_bss);
        os_free(drv);
 }
 
 
-/**
- * wpa_driver_nl80211_scan_timeout - Scan timeout to report scan completion
- * @eloop_ctx: Driver private data
- * @timeout_ctx: ctx argument given to wpa_driver_nl80211_init()
- *
- * This function can be used as registered timeout when starting a scan to
- * generate a scan completed event if the driver does not report this.
- */
-void wpa_driver_nl80211_scan_timeout(void *eloop_ctx, void *timeout_ctx)
+static u32 wpa_alg_to_cipher_suite(enum wpa_alg alg, size_t key_len)
 {
-       struct wpa_driver_nl80211_data *drv = eloop_ctx;
-       if (drv->ap_scan_as_station != NL80211_IFTYPE_UNSPECIFIED) {
-               wpa_driver_nl80211_set_mode(drv->first_bss,
-                                           drv->ap_scan_as_station);
-               drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
+       switch (alg) {
+       case WPA_ALG_WEP:
+               if (key_len == 5)
+                       return WLAN_CIPHER_SUITE_WEP40;
+               return WLAN_CIPHER_SUITE_WEP104;
+       case WPA_ALG_TKIP:
+               return WLAN_CIPHER_SUITE_TKIP;
+       case WPA_ALG_CCMP:
+               return WLAN_CIPHER_SUITE_CCMP;
+       case WPA_ALG_GCMP:
+               return WLAN_CIPHER_SUITE_GCMP;
+       case WPA_ALG_CCMP_256:
+               return WLAN_CIPHER_SUITE_CCMP_256;
+       case WPA_ALG_GCMP_256:
+               return WLAN_CIPHER_SUITE_GCMP_256;
+       case WPA_ALG_IGTK:
+               return WLAN_CIPHER_SUITE_AES_CMAC;
+       case WPA_ALG_BIP_GMAC_128:
+               return WLAN_CIPHER_SUITE_BIP_GMAC_128;
+       case WPA_ALG_BIP_GMAC_256:
+               return WLAN_CIPHER_SUITE_BIP_GMAC_256;
+       case WPA_ALG_BIP_CMAC_256:
+               return WLAN_CIPHER_SUITE_BIP_CMAC_256;
+       case WPA_ALG_SMS4:
+               return WLAN_CIPHER_SUITE_SMS4;
+       case WPA_ALG_KRK:
+               return WLAN_CIPHER_SUITE_KRK;
+       case WPA_ALG_NONE:
+       case WPA_ALG_PMK:
+               wpa_printf(MSG_ERROR, "nl80211: Unexpected encryption algorithm %d",
+                          alg);
+               return 0;
        }
-       wpa_printf(MSG_DEBUG, "Scan timeout - try to get results");
-       wpa_supplicant_event(timeout_ctx, EVENT_SCAN_RESULTS, NULL);
+
+       wpa_printf(MSG_ERROR, "nl80211: Unsupported encryption algorithm %d",
+                  alg);
+       return 0;
 }
 
 
-static struct nl_msg *
-nl80211_scan_common(struct wpa_driver_nl80211_data *drv, u8 cmd,
-                   struct wpa_driver_scan_params *params, u64 *wdev_id)
-{
-       struct nl_msg *msg;
-       size_t i;
-       u32 scan_flags = 0;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return NULL;
-
-       nl80211_cmd(drv, msg, 0, cmd);
-
-       if (!wdev_id)
-               NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       else
-               NLA_PUT_U64(msg, NL80211_ATTR_WDEV, *wdev_id);
-
-       if (params->num_ssids) {
-               struct nlattr *ssids;
-
-               ssids = nla_nest_start(msg, NL80211_ATTR_SCAN_SSIDS);
-               if (ssids == NULL)
-                       goto fail;
-               for (i = 0; i < params->num_ssids; i++) {
-                       wpa_hexdump_ascii(MSG_MSGDUMP, "nl80211: Scan SSID",
-                                         params->ssids[i].ssid,
-                                         params->ssids[i].ssid_len);
-                       if (nla_put(msg, i + 1, params->ssids[i].ssid_len,
-                                   params->ssids[i].ssid) < 0)
-                               goto fail;
-               }
-               nla_nest_end(msg, ssids);
-       }
-
-       if (params->extra_ies) {
-               wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs",
-                           params->extra_ies, params->extra_ies_len);
-               if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len,
-                           params->extra_ies) < 0)
-                       goto fail;
-       }
-
-       if (params->freqs) {
-               struct nlattr *freqs;
-               freqs = nla_nest_start(msg, NL80211_ATTR_SCAN_FREQUENCIES);
-               if (freqs == NULL)
-                       goto fail;
-               for (i = 0; params->freqs[i]; i++) {
-                       wpa_printf(MSG_MSGDUMP, "nl80211: Scan frequency %u "
-                                  "MHz", params->freqs[i]);
-                       if (nla_put_u32(msg, i + 1, params->freqs[i]) < 0)
-                               goto fail;
-               }
-               nla_nest_end(msg, freqs);
-       }
-
-       os_free(drv->filter_ssids);
-       drv->filter_ssids = params->filter_ssids;
-       params->filter_ssids = NULL;
-       drv->num_filter_ssids = params->num_filter_ssids;
-
-       if (params->only_new_results) {
-               wpa_printf(MSG_DEBUG, "nl80211: Add NL80211_SCAN_FLAG_FLUSH");
-               scan_flags |= NL80211_SCAN_FLAG_FLUSH;
-       }
-
-       if (params->low_priority && drv->have_low_prio_scan) {
-               wpa_printf(MSG_DEBUG,
-                          "nl80211: Add NL80211_SCAN_FLAG_LOW_PRIORITY");
-               scan_flags |= NL80211_SCAN_FLAG_LOW_PRIORITY;
-       }
-
-       if (scan_flags)
-               NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, scan_flags);
-
-       return msg;
-
-fail:
-nla_put_failure:
-       nlmsg_free(msg);
-       return NULL;
-}
-
-
-/**
- * wpa_driver_nl80211_scan - Request the driver to initiate scan
- * @bss: Pointer to private driver data from wpa_driver_nl80211_init()
- * @params: Scan parameters
- * Returns: 0 on success, -1 on failure
- */
-static int wpa_driver_nl80211_scan(struct i802_bss *bss,
-                                  struct wpa_driver_scan_params *params)
-{
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       int ret = -1, timeout;
-       struct nl_msg *msg = NULL;
-
-       wpa_dbg(drv->ctx, MSG_DEBUG, "nl80211: scan request");
-       drv->scan_for_auth = 0;
-
-       msg = nl80211_scan_common(drv, NL80211_CMD_TRIGGER_SCAN, params,
-                                 bss->wdev_id_set ? &bss->wdev_id : NULL);
-       if (!msg)
-               return -1;
-
-       if (params->p2p_probe) {
-               struct nlattr *rates;
-
-               wpa_printf(MSG_DEBUG, "nl80211: P2P probe - mask SuppRates");
-
-               rates = nla_nest_start(msg, NL80211_ATTR_SCAN_SUPP_RATES);
-               if (rates == NULL)
-                       goto nla_put_failure;
-
-               /*
-                * Remove 2.4 GHz rates 1, 2, 5.5, 11 Mbps from supported rates
-                * by masking out everything else apart from the OFDM rates 6,
-                * 9, 12, 18, 24, 36, 48, 54 Mbps from non-MCS rates. All 5 GHz
-                * rates are left enabled.
-                */
-               NLA_PUT(msg, NL80211_BAND_2GHZ, 8,
-                       "\x0c\x12\x18\x24\x30\x48\x60\x6c");
-               nla_nest_end(msg, rates);
-
-               NLA_PUT_FLAG(msg, NL80211_ATTR_TX_NO_CCK_RATE);
-       }
-
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
-       if (ret) {
-               wpa_printf(MSG_DEBUG, "nl80211: Scan trigger failed: ret=%d "
-                          "(%s)", ret, strerror(-ret));
-               if (drv->hostapd && is_ap_interface(drv->nlmode)) {
-                       enum nl80211_iftype old_mode = drv->nlmode;
-
-                       /*
-                        * mac80211 does not allow scan requests in AP mode, so
-                        * try to do this in station mode.
-                        */
-                       if (wpa_driver_nl80211_set_mode(
-                                   bss, NL80211_IFTYPE_STATION))
-                               goto nla_put_failure;
-
-                       if (wpa_driver_nl80211_scan(bss, params)) {
-                               wpa_driver_nl80211_set_mode(bss, drv->nlmode);
-                               goto nla_put_failure;
-                       }
-
-                       /* Restore AP mode when processing scan results */
-                       drv->ap_scan_as_station = old_mode;
-                       ret = 0;
-               } else
-                       goto nla_put_failure;
-       }
-
-       drv->scan_state = SCAN_REQUESTED;
-       /* Not all drivers generate "scan completed" wireless event, so try to
-        * read results after a timeout. */
-       timeout = 10;
-       if (drv->scan_complete_events) {
-               /*
-                * The driver seems to deliver events to notify when scan is
-                * complete, so use longer timeout to avoid race conditions
-                * with scanning and following association request.
-                */
-               timeout = 30;
-       }
-       wpa_printf(MSG_DEBUG, "Scan requested (ret=%d) - scan timeout %d "
-                  "seconds", ret, timeout);
-       eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx);
-       eloop_register_timeout(timeout, 0, wpa_driver_nl80211_scan_timeout,
-                              drv, drv->ctx);
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-}
-
-
-/**
- * wpa_driver_nl80211_sched_scan - Initiate a scheduled scan
- * @priv: Pointer to private driver data from wpa_driver_nl80211_init()
- * @params: Scan parameters
- * @interval: Interval between scan cycles in milliseconds
- * Returns: 0 on success, -1 on failure or if not supported
- */
-static int wpa_driver_nl80211_sched_scan(void *priv,
-                                        struct wpa_driver_scan_params *params,
-                                        u32 interval)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       int ret = -1;
-       struct nl_msg *msg;
-       size_t i;
-
-       wpa_dbg(drv->ctx, MSG_DEBUG, "nl80211: sched_scan request");
-
-#ifdef ANDROID
-       if (!drv->capa.sched_scan_supported)
-               return android_pno_start(bss, params);
-#endif /* ANDROID */
-
-       msg = nl80211_scan_common(drv, NL80211_CMD_START_SCHED_SCAN, params,
-                                 bss->wdev_id_set ? &bss->wdev_id : NULL);
-       if (!msg)
-               goto nla_put_failure;
-
-       NLA_PUT_U32(msg, NL80211_ATTR_SCHED_SCAN_INTERVAL, interval);
-
-       if ((drv->num_filter_ssids &&
-           (int) drv->num_filter_ssids <= drv->capa.max_match_sets) ||
-           params->filter_rssi) {
-               struct nlattr *match_sets;
-               match_sets = nla_nest_start(msg, NL80211_ATTR_SCHED_SCAN_MATCH);
-               if (match_sets == NULL)
-                       goto nla_put_failure;
-
-               for (i = 0; i < drv->num_filter_ssids; i++) {
-                       struct nlattr *match_set_ssid;
-                       wpa_hexdump_ascii(MSG_MSGDUMP,
-                                         "nl80211: Sched scan filter SSID",
-                                         drv->filter_ssids[i].ssid,
-                                         drv->filter_ssids[i].ssid_len);
-
-                       match_set_ssid = nla_nest_start(msg, i + 1);
-                       if (match_set_ssid == NULL)
-                               goto nla_put_failure;
-                       NLA_PUT(msg, NL80211_ATTR_SCHED_SCAN_MATCH_SSID,
-                               drv->filter_ssids[i].ssid_len,
-                               drv->filter_ssids[i].ssid);
-                       if (params->filter_rssi)
-                               NLA_PUT_U32(msg,
-                                           NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
-                                           params->filter_rssi);
-
-                       nla_nest_end(msg, match_set_ssid);
-               }
-
-               /*
-                * Due to backward compatibility code, newer kernels treat this
-                * matchset (with only an RSSI filter) as the default for all
-                * other matchsets, unless it's the only one, in which case the
-                * matchset will actually allow all SSIDs above the RSSI.
-                */
-               if (params->filter_rssi) {
-                       struct nlattr *match_set_rssi;
-                       match_set_rssi = nla_nest_start(msg, 0);
-                       if (match_set_rssi == NULL)
-                               goto nla_put_failure;
-                       NLA_PUT_U32(msg, NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
-                                   params->filter_rssi);
-                       wpa_printf(MSG_MSGDUMP,
-                                  "nl80211: Sched scan RSSI filter %d dBm",
-                                  params->filter_rssi);
-                       nla_nest_end(msg, match_set_rssi);
-               }
-
-               nla_nest_end(msg, match_sets);
-       }
-
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-
-       /* TODO: if we get an error here, we should fall back to normal scan */
-
-       msg = NULL;
-       if (ret) {
-               wpa_printf(MSG_DEBUG, "nl80211: Sched scan start failed: "
-                          "ret=%d (%s)", ret, strerror(-ret));
-               goto nla_put_failure;
-       }
-
-       wpa_printf(MSG_DEBUG, "nl80211: Sched scan requested (ret=%d) - "
-                  "scan interval %d msec", ret, interval);
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-}
-
-
-/**
- * wpa_driver_nl80211_stop_sched_scan - Stop a scheduled scan
- * @priv: Pointer to private driver data from wpa_driver_nl80211_init()
- * Returns: 0 on success, -1 on failure or if not supported
- */
-static int wpa_driver_nl80211_stop_sched_scan(void *priv)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       int ret = 0;
-       struct nl_msg *msg;
-
-#ifdef ANDROID
-       if (!drv->capa.sched_scan_supported)
-               return android_pno_stop(bss);
-#endif /* ANDROID */
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_STOP_SCHED_SCAN);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
-       if (ret) {
-               wpa_printf(MSG_DEBUG, "nl80211: Sched scan stop failed: "
-                          "ret=%d (%s)", ret, strerror(-ret));
-               goto nla_put_failure;
-       }
-
-       wpa_printf(MSG_DEBUG, "nl80211: Sched scan stop sent (ret=%d)", ret);
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-}
-
-
-static const u8 * nl80211_get_ie(const u8 *ies, size_t ies_len, u8 ie)
-{
-       const u8 *end, *pos;
-
-       if (ies == NULL)
-               return NULL;
-
-       pos = ies;
-       end = ies + ies_len;
-
-       while (pos + 1 < end) {
-               if (pos + 2 + pos[1] > end)
-                       break;
-               if (pos[0] == ie)
-                       return pos;
-               pos += 2 + pos[1];
-       }
-
-       return NULL;
-}
-
-
-static int nl80211_scan_filtered(struct wpa_driver_nl80211_data *drv,
-                                const u8 *ie, size_t ie_len)
-{
-       const u8 *ssid;
-       size_t i;
-
-       if (drv->filter_ssids == NULL)
-               return 0;
-
-       ssid = nl80211_get_ie(ie, ie_len, WLAN_EID_SSID);
-       if (ssid == NULL)
-               return 1;
-
-       for (i = 0; i < drv->num_filter_ssids; i++) {
-               if (ssid[1] == drv->filter_ssids[i].ssid_len &&
-                   os_memcmp(ssid + 2, drv->filter_ssids[i].ssid, ssid[1]) ==
-                   0)
-                       return 0;
-       }
-
-       return 1;
-}
-
-
-static int bss_info_handler(struct nl_msg *msg, void *arg)
-{
-       struct nlattr *tb[NL80211_ATTR_MAX + 1];
-       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-       struct nlattr *bss[NL80211_BSS_MAX + 1];
-       static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = {
-               [NL80211_BSS_BSSID] = { .type = NLA_UNSPEC },
-               [NL80211_BSS_FREQUENCY] = { .type = NLA_U32 },
-               [NL80211_BSS_TSF] = { .type = NLA_U64 },
-               [NL80211_BSS_BEACON_INTERVAL] = { .type = NLA_U16 },
-               [NL80211_BSS_CAPABILITY] = { .type = NLA_U16 },
-               [NL80211_BSS_INFORMATION_ELEMENTS] = { .type = NLA_UNSPEC },
-               [NL80211_BSS_SIGNAL_MBM] = { .type = NLA_U32 },
-               [NL80211_BSS_SIGNAL_UNSPEC] = { .type = NLA_U8 },
-               [NL80211_BSS_STATUS] = { .type = NLA_U32 },
-               [NL80211_BSS_SEEN_MS_AGO] = { .type = NLA_U32 },
-               [NL80211_BSS_BEACON_IES] = { .type = NLA_UNSPEC },
-       };
-       struct nl80211_bss_info_arg *_arg = arg;
-       struct wpa_scan_results *res = _arg->res;
-       struct wpa_scan_res **tmp;
-       struct wpa_scan_res *r;
-       const u8 *ie, *beacon_ie;
-       size_t ie_len, beacon_ie_len;
-       u8 *pos;
-       size_t i;
-
-       nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
-                 genlmsg_attrlen(gnlh, 0), NULL);
-       if (!tb[NL80211_ATTR_BSS])
-               return NL_SKIP;
-       if (nla_parse_nested(bss, NL80211_BSS_MAX, tb[NL80211_ATTR_BSS],
-                            bss_policy))
-               return NL_SKIP;
-       if (bss[NL80211_BSS_STATUS]) {
-               enum nl80211_bss_status status;
-               status = nla_get_u32(bss[NL80211_BSS_STATUS]);
-               if (status == NL80211_BSS_STATUS_ASSOCIATED &&
-                   bss[NL80211_BSS_FREQUENCY]) {
-                       _arg->assoc_freq =
-                               nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
-                       wpa_printf(MSG_DEBUG, "nl80211: Associated on %u MHz",
-                                  _arg->assoc_freq);
-               }
-               if (status == NL80211_BSS_STATUS_IBSS_JOINED &&
-                   bss[NL80211_BSS_FREQUENCY]) {
-                       _arg->ibss_freq =
-                               nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
-                       wpa_printf(MSG_DEBUG, "nl80211: IBSS-joined on %u MHz",
-                                  _arg->ibss_freq);
-               }
-               if (status == NL80211_BSS_STATUS_ASSOCIATED &&
-                   bss[NL80211_BSS_BSSID]) {
-                       os_memcpy(_arg->assoc_bssid,
-                                 nla_data(bss[NL80211_BSS_BSSID]), ETH_ALEN);
-                       wpa_printf(MSG_DEBUG, "nl80211: Associated with "
-                                  MACSTR, MAC2STR(_arg->assoc_bssid));
-               }
-       }
-       if (!res)
-               return NL_SKIP;
-       if (bss[NL80211_BSS_INFORMATION_ELEMENTS]) {
-               ie = nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
-               ie_len = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
-       } else {
-               ie = NULL;
-               ie_len = 0;
-       }
-       if (bss[NL80211_BSS_BEACON_IES]) {
-               beacon_ie = nla_data(bss[NL80211_BSS_BEACON_IES]);
-               beacon_ie_len = nla_len(bss[NL80211_BSS_BEACON_IES]);
-       } else {
-               beacon_ie = NULL;
-               beacon_ie_len = 0;
-       }
-
-       if (nl80211_scan_filtered(_arg->drv, ie ? ie : beacon_ie,
-                                 ie ? ie_len : beacon_ie_len))
-               return NL_SKIP;
-
-       r = os_zalloc(sizeof(*r) + ie_len + beacon_ie_len);
-       if (r == NULL)
-               return NL_SKIP;
-       if (bss[NL80211_BSS_BSSID])
-               os_memcpy(r->bssid, nla_data(bss[NL80211_BSS_BSSID]),
-                         ETH_ALEN);
-       if (bss[NL80211_BSS_FREQUENCY])
-               r->freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
-       if (bss[NL80211_BSS_BEACON_INTERVAL])
-               r->beacon_int = nla_get_u16(bss[NL80211_BSS_BEACON_INTERVAL]);
-       if (bss[NL80211_BSS_CAPABILITY])
-               r->caps = nla_get_u16(bss[NL80211_BSS_CAPABILITY]);
-       r->flags |= WPA_SCAN_NOISE_INVALID;
-       if (bss[NL80211_BSS_SIGNAL_MBM]) {
-               r->level = nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM]);
-               r->level /= 100; /* mBm to dBm */
-               r->flags |= WPA_SCAN_LEVEL_DBM | WPA_SCAN_QUAL_INVALID;
-       } else if (bss[NL80211_BSS_SIGNAL_UNSPEC]) {
-               r->level = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
-               r->flags |= WPA_SCAN_QUAL_INVALID;
-       } else
-               r->flags |= WPA_SCAN_LEVEL_INVALID | WPA_SCAN_QUAL_INVALID;
-       if (bss[NL80211_BSS_TSF])
-               r->tsf = nla_get_u64(bss[NL80211_BSS_TSF]);
-       if (bss[NL80211_BSS_SEEN_MS_AGO])
-               r->age = nla_get_u32(bss[NL80211_BSS_SEEN_MS_AGO]);
-       r->ie_len = ie_len;
-       pos = (u8 *) (r + 1);
-       if (ie) {
-               os_memcpy(pos, ie, ie_len);
-               pos += ie_len;
-       }
-       r->beacon_ie_len = beacon_ie_len;
-       if (beacon_ie)
-               os_memcpy(pos, beacon_ie, beacon_ie_len);
-
-       if (bss[NL80211_BSS_STATUS]) {
-               enum nl80211_bss_status status;
-               status = nla_get_u32(bss[NL80211_BSS_STATUS]);
-               switch (status) {
-               case NL80211_BSS_STATUS_AUTHENTICATED:
-                       r->flags |= WPA_SCAN_AUTHENTICATED;
-                       break;
-               case NL80211_BSS_STATUS_ASSOCIATED:
-                       r->flags |= WPA_SCAN_ASSOCIATED;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       /*
-        * cfg80211 maintains separate BSS table entries for APs if the same
-        * BSSID,SSID pair is seen on multiple channels. wpa_supplicant does
-        * not use frequency as a separate key in the BSS table, so filter out
-        * duplicated entries. Prefer associated BSS entry in such a case in
-        * order to get the correct frequency into the BSS table. Similarly,
-        * prefer newer entries over older.
-        */
-       for (i = 0; i < res->num; i++) {
-               const u8 *s1, *s2;
-               if (os_memcmp(res->res[i]->bssid, r->bssid, ETH_ALEN) != 0)
-                       continue;
-
-               s1 = nl80211_get_ie((u8 *) (res->res[i] + 1),
-                                   res->res[i]->ie_len, WLAN_EID_SSID);
-               s2 = nl80211_get_ie((u8 *) (r + 1), r->ie_len, WLAN_EID_SSID);
-               if (s1 == NULL || s2 == NULL || s1[1] != s2[1] ||
-                   os_memcmp(s1, s2, 2 + s1[1]) != 0)
-                       continue;
-
-               /* Same BSSID,SSID was already included in scan results */
-               wpa_printf(MSG_DEBUG, "nl80211: Remove duplicated scan result "
-                          "for " MACSTR, MAC2STR(r->bssid));
-
-               if (((r->flags & WPA_SCAN_ASSOCIATED) &&
-                    !(res->res[i]->flags & WPA_SCAN_ASSOCIATED)) ||
-                   r->age < res->res[i]->age) {
-                       os_free(res->res[i]);
-                       res->res[i] = r;
-               } else
-                       os_free(r);
-               return NL_SKIP;
-       }
-
-       tmp = os_realloc_array(res->res, res->num + 1,
-                              sizeof(struct wpa_scan_res *));
-       if (tmp == NULL) {
-               os_free(r);
-               return NL_SKIP;
-       }
-       tmp[res->num++] = r;
-       res->res = tmp;
-
-       return NL_SKIP;
-}
-
-
-static void clear_state_mismatch(struct wpa_driver_nl80211_data *drv,
-                                const u8 *addr)
-{
-       if (drv->capa.flags & WPA_DRIVER_FLAGS_SME) {
-               wpa_printf(MSG_DEBUG, "nl80211: Clear possible state "
-                          "mismatch (" MACSTR ")", MAC2STR(addr));
-               wpa_driver_nl80211_mlme(drv, addr,
-                                       NL80211_CMD_DEAUTHENTICATE,
-                                       WLAN_REASON_PREV_AUTH_NOT_VALID, 1);
-       }
-}
-
-
-static void wpa_driver_nl80211_check_bss_status(
-       struct wpa_driver_nl80211_data *drv, struct wpa_scan_results *res)
-{
-       size_t i;
-
-       for (i = 0; i < res->num; i++) {
-               struct wpa_scan_res *r = res->res[i];
-               if (r->flags & WPA_SCAN_AUTHENTICATED) {
-                       wpa_printf(MSG_DEBUG, "nl80211: Scan results "
-                                  "indicates BSS status with " MACSTR
-                                  " as authenticated",
-                                  MAC2STR(r->bssid));
-                       if (is_sta_interface(drv->nlmode) &&
-                           os_memcmp(r->bssid, drv->bssid, ETH_ALEN) != 0 &&
-                           os_memcmp(r->bssid, drv->auth_bssid, ETH_ALEN) !=
-                           0) {
-                               wpa_printf(MSG_DEBUG, "nl80211: Unknown BSSID"
-                                          " in local state (auth=" MACSTR
-                                          " assoc=" MACSTR ")",
-                                          MAC2STR(drv->auth_bssid),
-                                          MAC2STR(drv->bssid));
-                               clear_state_mismatch(drv, r->bssid);
-                       }
-               }
-
-               if (r->flags & WPA_SCAN_ASSOCIATED) {
-                       wpa_printf(MSG_DEBUG, "nl80211: Scan results "
-                                  "indicate BSS status with " MACSTR
-                                  " as associated",
-                                  MAC2STR(r->bssid));
-                       if (is_sta_interface(drv->nlmode) &&
-                           !drv->associated) {
-                               wpa_printf(MSG_DEBUG, "nl80211: Local state "
-                                          "(not associated) does not match "
-                                          "with BSS state");
-                               clear_state_mismatch(drv, r->bssid);
-                       } else if (is_sta_interface(drv->nlmode) &&
-                                  os_memcmp(drv->bssid, r->bssid, ETH_ALEN) !=
-                                  0) {
-                               wpa_printf(MSG_DEBUG, "nl80211: Local state "
-                                          "(associated with " MACSTR ") does "
-                                          "not match with BSS state",
-                                          MAC2STR(drv->bssid));
-                               clear_state_mismatch(drv, r->bssid);
-                               clear_state_mismatch(drv, drv->bssid);
-                       }
-               }
-       }
-}
-
-
-static struct wpa_scan_results *
-nl80211_get_scan_results(struct wpa_driver_nl80211_data *drv)
-{
-       struct nl_msg *msg;
-       struct wpa_scan_results *res;
-       int ret;
-       struct nl80211_bss_info_arg arg;
-
-       res = os_zalloc(sizeof(*res));
-       if (res == NULL)
-               return NULL;
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto nla_put_failure;
-
-       nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_SCAN);
-       if (nl80211_set_iface_id(msg, drv->first_bss) < 0)
-               goto nla_put_failure;
-
-       arg.drv = drv;
-       arg.res = res;
-       ret = send_and_recv_msgs(drv, msg, bss_info_handler, &arg);
-       msg = NULL;
-       if (ret == 0) {
-               wpa_printf(MSG_DEBUG, "nl80211: Received scan results (%lu "
-                          "BSSes)", (unsigned long) res->num);
-               nl80211_get_noise_for_scan_results(drv, res);
-               return res;
-       }
-       wpa_printf(MSG_DEBUG, "nl80211: Scan result fetch failed: ret=%d "
-                  "(%s)", ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
-       wpa_scan_results_free(res);
-       return NULL;
-}
-
-
-/**
- * wpa_driver_nl80211_get_scan_results - Fetch the latest scan results
- * @priv: Pointer to private wext data from wpa_driver_nl80211_init()
- * Returns: Scan results on success, -1 on failure
- */
-static struct wpa_scan_results *
-wpa_driver_nl80211_get_scan_results(void *priv)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       struct wpa_scan_results *res;
-
-       res = nl80211_get_scan_results(drv);
-       if (res)
-               wpa_driver_nl80211_check_bss_status(drv, res);
-       return res;
-}
-
-
-static void nl80211_dump_scan(struct wpa_driver_nl80211_data *drv)
-{
-       struct wpa_scan_results *res;
-       size_t i;
-
-       res = nl80211_get_scan_results(drv);
-       if (res == NULL) {
-               wpa_printf(MSG_DEBUG, "nl80211: Failed to get scan results");
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "nl80211: Scan result dump");
-       for (i = 0; i < res->num; i++) {
-               struct wpa_scan_res *r = res->res[i];
-               wpa_printf(MSG_DEBUG, "nl80211: %d/%d " MACSTR "%s%s",
-                          (int) i, (int) res->num, MAC2STR(r->bssid),
-                          r->flags & WPA_SCAN_AUTHENTICATED ? " [auth]" : "",
-                          r->flags & WPA_SCAN_ASSOCIATED ? " [assoc]" : "");
-       }
-
-       wpa_scan_results_free(res);
-}
-
-
-static u32 wpa_alg_to_cipher_suite(enum wpa_alg alg, size_t key_len)
-{
-       switch (alg) {
-       case WPA_ALG_WEP:
-               if (key_len == 5)
-                       return WLAN_CIPHER_SUITE_WEP40;
-               return WLAN_CIPHER_SUITE_WEP104;
-       case WPA_ALG_TKIP:
-               return WLAN_CIPHER_SUITE_TKIP;
-       case WPA_ALG_CCMP:
-               return WLAN_CIPHER_SUITE_CCMP;
-       case WPA_ALG_GCMP:
-               return WLAN_CIPHER_SUITE_GCMP;
-       case WPA_ALG_CCMP_256:
-               return WLAN_CIPHER_SUITE_CCMP_256;
-       case WPA_ALG_GCMP_256:
-               return WLAN_CIPHER_SUITE_GCMP_256;
-       case WPA_ALG_IGTK:
-               return WLAN_CIPHER_SUITE_AES_CMAC;
-       case WPA_ALG_BIP_GMAC_128:
-               return WLAN_CIPHER_SUITE_BIP_GMAC_128;
-       case WPA_ALG_BIP_GMAC_256:
-               return WLAN_CIPHER_SUITE_BIP_GMAC_256;
-       case WPA_ALG_BIP_CMAC_256:
-               return WLAN_CIPHER_SUITE_BIP_CMAC_256;
-       case WPA_ALG_SMS4:
-               return WLAN_CIPHER_SUITE_SMS4;
-       case WPA_ALG_KRK:
-               return WLAN_CIPHER_SUITE_KRK;
-       case WPA_ALG_NONE:
-       case WPA_ALG_PMK:
-               wpa_printf(MSG_ERROR, "nl80211: Unexpected encryption algorithm %d",
-                          alg);
-               return 0;
-       }
-
-       wpa_printf(MSG_ERROR, "nl80211: Unsupported encryption algorithm %d",
-                  alg);
-       return 0;
-}
-
-
-static u32 wpa_cipher_to_cipher_suite(unsigned int cipher)
+static u32 wpa_cipher_to_cipher_suite(unsigned int cipher)
 {
        switch (cipher) {
        case WPA_CIPHER_CCMP_256:
@@ -3197,37 +2611,35 @@ static int wpa_cipher_to_cipher_suites(unsigned int ciphers, u32 suites[],
 }
 
 
+#ifdef CONFIG_DRIVER_NL80211_QCA
 static int issue_key_mgmt_set_key(struct wpa_driver_nl80211_data *drv,
                                  const u8 *key, size_t key_len)
 {
        struct nl_msg *msg;
-       int ret = 0;
+       int ret;
 
-       if (!drv->key_mgmt_set_key_vendor_cmd_avail)
+       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_KEY_MGMT_OFFLOAD))
                return 0;
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_SET_KEY) ||
+           nla_put(msg, NL80211_ATTR_VENDOR_DATA, key_len, key)) {
+               nl80211_nlmsg_clear(msg);
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA);
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_SUBCMD,
-                   QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_SET_KEY);
-       NLA_PUT(msg, NL80211_ATTR_VENDOR_DATA, key_len, key);
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
+       }
+       ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1);
        if (ret) {
                wpa_printf(MSG_DEBUG,
                           "nl80211: Key management set key failed: ret=%d (%s)",
                           ret, strerror(-ret));
        }
 
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
+#endif /* CONFIG_DRIVER_NL80211_QCA */
 
 
 static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
@@ -3238,7 +2650,7 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        int ifindex;
-       struct nl_msg *msg;
+       struct nl_msg *msg = NULL;
        int ret;
        int tdls = 0;
 
@@ -3258,40 +2670,50 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
        }
 #endif /* CONFIG_TDLS */
 
-       if (alg == WPA_ALG_PMK && drv->key_mgmt_set_key_vendor_cmd_avail) {
+#ifdef CONFIG_DRIVER_NL80211_QCA
+       if (alg == WPA_ALG_PMK &&
+           (drv->capa.flags & WPA_DRIVER_FLAGS_KEY_MGMT_OFFLOAD)) {
                wpa_printf(MSG_DEBUG, "%s: calling issue_key_mgmt_set_key",
                           __func__);
                ret = issue_key_mgmt_set_key(drv, key, key_len);
                return ret;
        }
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+#endif /* CONFIG_DRIVER_NL80211_QCA */
 
        if (alg == WPA_ALG_NONE) {
-               nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_KEY);
+               msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_DEL_KEY);
+               if (!msg)
+                       return -ENOBUFS;
        } else {
-               nl80211_cmd(drv, msg, 0, NL80211_CMD_NEW_KEY);
-               NLA_PUT(msg, NL80211_ATTR_KEY_DATA, key_len, key);
+               u32 suite;
+
+               suite = wpa_alg_to_cipher_suite(alg, key_len);
+               if (!suite)
+                       goto fail;
+               msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_NEW_KEY);
+               if (!msg ||
+                   nla_put(msg, NL80211_ATTR_KEY_DATA, key_len, key) ||
+                   nla_put_u32(msg, NL80211_ATTR_KEY_CIPHER, suite))
+                       goto fail;
                wpa_hexdump_key(MSG_DEBUG, "nl80211: KEY_DATA", key, key_len);
-               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                           wpa_alg_to_cipher_suite(alg, key_len));
        }
 
        if (seq && seq_len) {
-               NLA_PUT(msg, NL80211_ATTR_KEY_SEQ, seq_len, seq);
+               if (nla_put(msg, NL80211_ATTR_KEY_SEQ, seq_len, seq))
+                       goto fail;
                wpa_hexdump(MSG_DEBUG, "nl80211: KEY_SEQ", seq, seq_len);
        }
 
        if (addr && !is_broadcast_ether_addr(addr)) {
                wpa_printf(MSG_DEBUG, "   addr=" MACSTR, MAC2STR(addr));
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
+               if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr))
+                       goto fail;
 
                if (alg != WPA_ALG_WEP && key_idx && !set_tx) {
                        wpa_printf(MSG_DEBUG, "   RSN IBSS RX GTK");
-                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_TYPE,
-                                   NL80211_KEYTYPE_GROUP);
+                       if (nla_put_u32(msg, NL80211_ATTR_KEY_TYPE,
+                                       NL80211_KEYTYPE_GROUP))
+                               goto fail;
                }
        } else if (addr && is_broadcast_ether_addr(addr)) {
                struct nlattr *types;
@@ -3299,15 +2721,15 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
                wpa_printf(MSG_DEBUG, "   broadcast key");
 
                types = nla_nest_start(msg, NL80211_ATTR_KEY_DEFAULT_TYPES);
-               if (!types)
-                       goto nla_put_failure;
-               NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT_TYPE_MULTICAST);
+               if (!types ||
+                   nla_put_flag(msg, NL80211_KEY_DEFAULT_TYPE_MULTICAST))
+                       goto fail;
                nla_nest_end(msg, types);
        }
-       NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_idx);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
+       if (nla_put_u8(msg, NL80211_ATTR_KEY_IDX, key_idx))
+               goto fail;
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       ret = send_and_recv_msgs(drv, msg, NULL, key ? (void *) -1 : NULL);
        if ((ret == -ENOENT || ret == -ENOLINK) && alg == WPA_ALG_NONE)
                ret = 0;
        if (ret)
@@ -3324,32 +2746,31 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
            !is_broadcast_ether_addr(addr))
                return ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_KEY);
-       NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_idx);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
-       if (alg == WPA_ALG_IGTK)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT_MGMT);
-       else
-               NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT);
+       msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_SET_KEY);
+       if (!msg ||
+           nla_put_u8(msg, NL80211_ATTR_KEY_IDX, key_idx) ||
+           nla_put_flag(msg, (alg == WPA_ALG_IGTK ||
+                              alg == WPA_ALG_BIP_GMAC_128 ||
+                              alg == WPA_ALG_BIP_GMAC_256 ||
+                              alg == WPA_ALG_BIP_CMAC_256) ?
+                        NL80211_ATTR_KEY_DEFAULT_MGMT :
+                        NL80211_ATTR_KEY_DEFAULT))
+               goto fail;
        if (addr && is_broadcast_ether_addr(addr)) {
                struct nlattr *types;
 
                types = nla_nest_start(msg, NL80211_ATTR_KEY_DEFAULT_TYPES);
-               if (!types)
-                       goto nla_put_failure;
-               NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT_TYPE_MULTICAST);
+               if (!types ||
+                   nla_put_flag(msg, NL80211_KEY_DEFAULT_TYPE_MULTICAST))
+                       goto fail;
                nla_nest_end(msg, types);
        } else if (addr) {
                struct nlattr *types;
 
                types = nla_nest_start(msg, NL80211_ATTR_KEY_DEFAULT_TYPES);
-               if (!types)
-                       goto nla_put_failure;
-               NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT_TYPE_UNICAST);
+               if (!types ||
+                   nla_put_flag(msg, NL80211_KEY_DEFAULT_TYPE_UNICAST))
+                       goto fail;
                nla_nest_end(msg, types);
        }
 
@@ -3361,7 +2782,8 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
                           "err=%d %s)", ret, strerror(-ret));
        return ret;
 
-nla_put_failure:
+fail:
+       nl80211_nlmsg_clear(msg);
        nlmsg_free(msg);
        return -ENOBUFS;
 }
@@ -3373,29 +2795,33 @@ static int nl_add_key(struct nl_msg *msg, enum wpa_alg alg,
                      const u8 *key, size_t key_len)
 {
        struct nlattr *key_attr = nla_nest_start(msg, NL80211_ATTR_KEY);
+       u32 suite;
+
        if (!key_attr)
                return -1;
 
-       if (defkey && alg == WPA_ALG_IGTK)
-               NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT_MGMT);
-       else if (defkey)
-               NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT);
-
-       NLA_PUT_U8(msg, NL80211_KEY_IDX, key_idx);
-
-       NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
-                   wpa_alg_to_cipher_suite(alg, key_len));
+       suite = wpa_alg_to_cipher_suite(alg, key_len);
+       if (!suite)
+               return -1;
 
-       if (seq && seq_len)
-               NLA_PUT(msg, NL80211_KEY_SEQ, seq_len, seq);
+       if (defkey && alg == WPA_ALG_IGTK) {
+               if (nla_put_flag(msg, NL80211_KEY_DEFAULT_MGMT))
+                       return -1;
+       } else if (defkey) {
+               if (nla_put_flag(msg, NL80211_KEY_DEFAULT))
+                       return -1;
+       }
 
-       NLA_PUT(msg, NL80211_KEY_DATA, key_len, key);
+       if (nla_put_u8(msg, NL80211_KEY_IDX, key_idx) ||
+           nla_put_u32(msg, NL80211_KEY_CIPHER, suite) ||
+           (seq && seq_len &&
+            nla_put(msg, NL80211_KEY_SEQ, seq_len, seq)) ||
+           nla_put(msg, NL80211_KEY_DATA, key_len, key))
+               return -1;
 
        nla_nest_end(msg, key_attr);
 
        return 0;
- nla_put_failure:
-       return -1;
 }
 
 
@@ -3420,77 +2846,60 @@ static int nl80211_set_conn_keys(struct wpa_driver_associate_params *params,
        if (!privacy)
                return 0;
 
-       NLA_PUT_FLAG(msg, NL80211_ATTR_PRIVACY);
+       if (nla_put_flag(msg, NL80211_ATTR_PRIVACY))
+               return -ENOBUFS;
 
        nl_keys = nla_nest_start(msg, NL80211_ATTR_KEYS);
        if (!nl_keys)
-               goto nla_put_failure;
+               return -ENOBUFS;
 
        for (i = 0; i < 4; i++) {
                if (!params->wep_key[i])
                        continue;
 
                nl_key = nla_nest_start(msg, i);
-               if (!nl_key)
-                       goto nla_put_failure;
-
-               NLA_PUT(msg, NL80211_KEY_DATA, params->wep_key_len[i],
-                       params->wep_key[i]);
-               if (params->wep_key_len[i] == 5)
-                       NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
-                                   WLAN_CIPHER_SUITE_WEP40);
-               else
-                       NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
-                                   WLAN_CIPHER_SUITE_WEP104);
-
-               NLA_PUT_U8(msg, NL80211_KEY_IDX, i);
-
-               if (i == params->wep_tx_keyidx)
-                       NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT);
+               if (!nl_key ||
+                   nla_put(msg, NL80211_KEY_DATA, params->wep_key_len[i],
+                           params->wep_key[i]) ||
+                   nla_put_u32(msg, NL80211_KEY_CIPHER,
+                               params->wep_key_len[i] == 5 ?
+                               WLAN_CIPHER_SUITE_WEP40 :
+                               WLAN_CIPHER_SUITE_WEP104) ||
+                   nla_put_u8(msg, NL80211_KEY_IDX, i) ||
+                   (i == params->wep_tx_keyidx &&
+                    nla_put_flag(msg, NL80211_KEY_DEFAULT)))
+                       return -ENOBUFS;
 
                nla_nest_end(msg, nl_key);
        }
        nla_nest_end(msg, nl_keys);
 
        return 0;
-
-nla_put_failure:
-       return -ENOBUFS;
 }
 
 
-static int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *addr, int cmd, u16 reason_code,
-                                  int local_state_change)
+int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
+                           const u8 *addr, int cmd, u16 reason_code,
+                           int local_state_change)
 {
-       int ret = -1;
+       int ret;
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_drv_msg(drv, 0, cmd)) ||
+           nla_put_u16(msg, NL80211_ATTR_REASON_CODE, reason_code) ||
+           (addr && nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) ||
+           (local_state_change &&
+            nla_put_flag(msg, NL80211_ATTR_LOCAL_STATE_CHANGE))) {
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(drv, msg, 0, cmd);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT_U16(msg, NL80211_ATTR_REASON_CODE, reason_code);
-       if (addr)
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       if (local_state_change)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_LOCAL_STATE_CHANGE);
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_dbg(drv->ctx, MSG_DEBUG,
                        "nl80211: MLME command failed: reason=%u ret=%d (%s)",
                        reason_code, ret, strerror(-ret));
-               goto nla_put_failure;
        }
-       ret = 0;
-
-nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
@@ -3523,7 +2932,7 @@ static int wpa_driver_nl80211_deauthenticate(struct i802_bss *bss,
 
        if (drv->nlmode == NL80211_IFTYPE_ADHOC) {
                nl80211_mark_disconnected(drv);
-               return nl80211_leave_ibss(drv);
+               return nl80211_leave_ibss(drv, 1);
        }
        if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME))
                return wpa_driver_nl80211_disconnect(drv, reason_code);
@@ -3587,6 +2996,25 @@ static void nl80211_copy_auth_params(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static void nl80211_unmask_11b_rates(struct i802_bss *bss)
+{
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       if (is_p2p_net_interface(drv->nlmode) || !drv->disabled_11b_rates)
+               return;
+
+       /*
+        * Looks like we failed to unmask 11b rates previously. This could
+        * happen, e.g., if the interface was down at the point in time when a
+        * P2P group was terminated.
+        */
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: Interface %s mode is for non-P2P, but 11b rates were disabled - re-enable them",
+                  bss->ifname);
+       nl80211_disable_11b_rates(drv, drv->ifindex, 0);
+}
+
+
 static int wpa_driver_nl80211_authenticate(
        struct i802_bss *bss, struct wpa_driver_auth_params *params)
 {
@@ -3598,6 +3026,8 @@ static int wpa_driver_nl80211_authenticate(
        int count = 0;
        int is_retry;
 
+       nl80211_unmask_11b_rates(bss);
+
        is_retry = drv->retry_auth;
        drv->retry_auth = 0;
        drv->ignore_deauth_event = 0;
@@ -3616,14 +3046,12 @@ static int wpa_driver_nl80211_authenticate(
                return -1;
 
 retry:
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
        wpa_printf(MSG_DEBUG, "nl80211: Authenticate (ifindex=%d)",
                   drv->ifindex);
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_AUTHENTICATE);
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_AUTHENTICATE);
+       if (!msg)
+               goto fail;
 
        for (i = 0; i < 4; i++) {
                if (!params->wep_key[i])
@@ -3636,36 +3064,38 @@ retry:
                if (params->wep_tx_keyidx != i)
                        continue;
                if (nl_add_key(msg, WPA_ALG_WEP, i, 1, NULL, 0,
-                              params->wep_key[i], params->wep_key_len[i])) {
-                       nlmsg_free(msg);
-                       return -1;
-               }
+                              params->wep_key[i], params->wep_key_len[i]))
+                       goto fail;
        }
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
        if (params->bssid) {
                wpa_printf(MSG_DEBUG, "  * bssid=" MACSTR,
                           MAC2STR(params->bssid));
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid);
+               if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid))
+                       goto fail;
        }
        if (params->freq) {
                wpa_printf(MSG_DEBUG, "  * freq=%d", params->freq);
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq);
+               if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq))
+                       goto fail;
        }
        if (params->ssid) {
                wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
                                  params->ssid, params->ssid_len);
-               NLA_PUT(msg, NL80211_ATTR_SSID, params->ssid_len,
-                       params->ssid);
+               if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
+                           params->ssid))
+                       goto fail;
        }
        wpa_hexdump(MSG_DEBUG, "  * IEs", params->ie, params->ie_len);
-       if (params->ie)
-               NLA_PUT(msg, NL80211_ATTR_IE, params->ie_len, params->ie);
+       if (params->ie &&
+           nla_put(msg, NL80211_ATTR_IE, params->ie_len, params->ie))
+               goto fail;
        if (params->sae_data) {
                wpa_hexdump(MSG_DEBUG, "  * SAE data", params->sae_data,
                            params->sae_data_len);
-               NLA_PUT(msg, NL80211_ATTR_SAE_DATA, params->sae_data_len,
-                       params->sae_data);
+               if (nla_put(msg, NL80211_ATTR_SAE_DATA, params->sae_data_len,
+                           params->sae_data))
+                       goto fail;
        }
        if (params->auth_alg & WPA_AUTH_ALG_OPEN)
                type = NL80211_AUTHTYPE_OPEN_SYSTEM;
@@ -3678,12 +3108,14 @@ retry:
        else if (params->auth_alg & WPA_AUTH_ALG_SAE)
                type = NL80211_AUTHTYPE_SAE;
        else
-               goto nla_put_failure;
+               goto fail;
        wpa_printf(MSG_DEBUG, "  * Auth Type %d", type);
-       NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE, type);
+       if (nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE, type))
+               goto fail;
        if (params->local_state_change) {
                wpa_printf(MSG_DEBUG, "  * Local state change only");
-               NLA_PUT_FLAG(msg, NL80211_ATTR_LOCAL_STATE_CHANGE);
+               if (nla_put_flag(msg, NL80211_ATTR_LOCAL_STATE_CHANGE))
+                       goto fail;
        }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
@@ -3751,14 +3183,12 @@ retry:
                        wpa_supplicant_event(drv->ctx, EVENT_AUTH_TIMED_OUT,
                                             &event);
                }
-
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Authentication request send successfully");
        }
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: Authentication request send "
-                  "successfully");
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 }
@@ -3806,7 +3236,9 @@ static int wpa_driver_nl80211_send_frame(struct i802_bss *bss,
                                         const void *data, size_t len,
                                         int encrypt, int noack,
                                         unsigned int freq, int no_cck,
-                                        int offchanok, unsigned int wait_time)
+                                        int offchanok, unsigned int wait_time,
+                                        const u16 *csa_offs,
+                                        size_t csa_offs_len)
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        u64 cookie;
@@ -3832,7 +3264,8 @@ static int wpa_driver_nl80211_send_frame(struct i802_bss *bss,
 
        wpa_printf(MSG_DEBUG, "nl80211: send_frame -> send_frame_cmd");
        res = nl80211_send_frame_cmd(bss, freq, wait_time, data, len,
-                                    &cookie, no_cck, noack, offchanok);
+                                    &cookie, no_cck, noack, offchanok,
+                                    csa_offs, csa_offs_len);
        if (res == 0 && !noack) {
                const struct ieee80211_mgmt *mgmt;
                u16 fc;
@@ -3858,7 +3291,9 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data,
                                        size_t data_len, int noack,
                                        unsigned int freq, int no_cck,
                                        int offchanok,
-                                       unsigned int wait_time)
+                                       unsigned int wait_time,
+                                       const u16 *csa_offs,
+                                       size_t csa_offs_len)
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct ieee80211_mgmt *mgmt;
@@ -3888,7 +3323,7 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data,
                }
                return nl80211_send_frame_cmd(bss, freq, 0,
                                              data, data_len, NULL, 1, noack,
-                                             1);
+                                             1, csa_offs, csa_offs_len);
        }
 
        if (drv->device_ap_sme && is_ap_interface(drv->nlmode)) {
@@ -3902,7 +3337,8 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data,
                                              wait_time,
                                              data, data_len,
                                              &drv->send_action_cookie,
-                                             no_cck, noack, offchanok);
+                                             no_cck, noack, offchanok,
+                                             csa_offs, csa_offs_len);
        }
 
        if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
@@ -3922,52 +3358,51 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data,
        wpa_printf(MSG_DEBUG, "nl80211: send_mlme -> send_frame");
        return wpa_driver_nl80211_send_frame(bss, data, data_len, encrypt,
                                             noack, freq, no_cck, offchanok,
-                                            wait_time);
+                                            wait_time, csa_offs,
+                                            csa_offs_len);
 }
 
 
-static int nl80211_set_bss(struct i802_bss *bss, int cts, int preamble,
-                          int slot, int ht_opmode, int ap_isolate,
-                          int *basic_rates)
+static int nl80211_put_basic_rates(struct nl_msg *msg, const int *basic_rates)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       struct nl_msg *msg;
+       u8 rates[NL80211_MAX_SUPP_RATES];
+       u8 rates_len = 0;
+       int i;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+       if (!basic_rates)
+               return 0;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_BSS);
+       for (i = 0; i < NL80211_MAX_SUPP_RATES && basic_rates[i] >= 0; i++)
+               rates[rates_len++] = basic_rates[i] / 5;
 
-       if (cts >= 0)
-               NLA_PUT_U8(msg, NL80211_ATTR_BSS_CTS_PROT, cts);
-       if (preamble >= 0)
-               NLA_PUT_U8(msg, NL80211_ATTR_BSS_SHORT_PREAMBLE, preamble);
-       if (slot >= 0)
-               NLA_PUT_U8(msg, NL80211_ATTR_BSS_SHORT_SLOT_TIME, slot);
-       if (ht_opmode >= 0)
-               NLA_PUT_U16(msg, NL80211_ATTR_BSS_HT_OPMODE, ht_opmode);
-       if (ap_isolate >= 0)
-               NLA_PUT_U8(msg, NL80211_ATTR_AP_ISOLATE, ap_isolate);
+       return nla_put(msg, NL80211_ATTR_BSS_BASIC_RATES, rates_len, rates);
+}
 
-       if (basic_rates) {
-               u8 rates[NL80211_MAX_SUPP_RATES];
-               u8 rates_len = 0;
-               int i;
 
-               for (i = 0; i < NL80211_MAX_SUPP_RATES && basic_rates[i] >= 0;
-                    i++)
-                       rates[rates_len++] = basic_rates[i] / 5;
+static int nl80211_set_bss(struct i802_bss *bss, int cts, int preamble,
+                          int slot, int ht_opmode, int ap_isolate,
+                          const int *basic_rates)
+{
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
 
-               NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, rates_len, rates);
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_BSS)) ||
+           (cts >= 0 &&
+            nla_put_u8(msg, NL80211_ATTR_BSS_CTS_PROT, cts)) ||
+           (preamble >= 0 &&
+            nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_PREAMBLE, preamble)) ||
+           (slot >= 0 &&
+            nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_SLOT_TIME, slot)) ||
+           (ht_opmode >= 0 &&
+            nla_put_u16(msg, NL80211_ATTR_BSS_HT_OPMODE, ht_opmode)) ||
+           (ap_isolate >= 0 &&
+            nla_put_u8(msg, NL80211_ATTR_AP_ISOLATE, ap_isolate)) ||
+           nl80211_put_basic_rates(msg, basic_rates)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
        }
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
-
        return send_and_recv_msgs(drv, msg, NULL, NULL);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -3977,9 +3412,9 @@ static int wpa_driver_nl80211_set_acl(void *priv,
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       struct nlattr *acl;
+       struct nl_msg *acl;
        unsigned int i;
-       int ret = 0;
+       int ret;
 
        if (!(drv->capa.max_acl_mac_addrs))
                return -ENOTSUP;
@@ -3987,44 +3422,52 @@ static int wpa_driver_nl80211_set_acl(void *priv,
        if (params->num_mac_acl > drv->capa.max_acl_mac_addrs)
                return -ENOTSUP;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_printf(MSG_DEBUG, "nl80211: Set %s ACL (num_mac_acl=%u)",
                   params->acl_policy ? "Accept" : "Deny", params->num_mac_acl);
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_MAC_ACL);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_ACL_POLICY, params->acl_policy ?
-                   NL80211_ACL_POLICY_DENY_UNLESS_LISTED :
-                   NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED);
-
-       acl = nla_nest_start(msg, NL80211_ATTR_MAC_ADDRS);
-       if (acl == NULL)
-               goto nla_put_failure;
-
-       for (i = 0; i < params->num_mac_acl; i++)
-               NLA_PUT(msg, i + 1, ETH_ALEN, params->mac_acl[i].addr);
+       acl = nlmsg_alloc();
+       if (!acl)
+               return -ENOMEM;
+       for (i = 0; i < params->num_mac_acl; i++) {
+               if (nla_put(acl, i + 1, ETH_ALEN, params->mac_acl[i].addr)) {
+                       nlmsg_free(acl);
+                       return -ENOMEM;
+               }
+       }
 
-       nla_nest_end(msg, acl);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_SET_MAC_ACL)) ||
+           nla_put_u32(msg, NL80211_ATTR_ACL_POLICY, params->acl_policy ?
+                       NL80211_ACL_POLICY_DENY_UNLESS_LISTED :
+                       NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED) ||
+           nla_put_nested(msg, NL80211_ATTR_MAC_ADDRS, acl)) {
+               nlmsg_free(msg);
+               nlmsg_free(acl);
+               return -ENOMEM;
+       }
+       nlmsg_free(acl);
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Failed to set MAC ACL: %d (%s)",
                           ret, strerror(-ret));
        }
 
-nla_put_failure:
-       nlmsg_free(msg);
-
        return ret;
 }
 
 
+static int nl80211_put_beacon_int(struct nl_msg *msg, int beacon_int)
+{
+       if (beacon_int > 0) {
+               wpa_printf(MSG_DEBUG, "  * beacon_int=%d", beacon_int);
+               return nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL,
+                                  beacon_int);
+       }
+
+       return 0;
+}
+
+
 static int wpa_driver_nl80211_set_ap(void *priv,
                                     struct wpa_driver_ap_params *params)
 {
@@ -4034,76 +3477,80 @@ static int wpa_driver_nl80211_set_ap(void *priv,
        u8 cmd = NL80211_CMD_NEW_BEACON;
        int ret;
        int beacon_set;
-       int ifindex = if_nametoindex(bss->ifname);
        int num_suites;
        int smps_mode;
        u32 suites[10], suite;
        u32 ver;
 
-       beacon_set = bss->beacon_set;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+       beacon_set = params->reenable ? 0 : bss->beacon_set;
 
        wpa_printf(MSG_DEBUG, "nl80211: Set beacon (beacon_set=%d)",
                   beacon_set);
        if (beacon_set)
                cmd = NL80211_CMD_SET_BEACON;
 
-       nl80211_cmd(drv, msg, 0, cmd);
        wpa_hexdump(MSG_DEBUG, "nl80211: Beacon head",
                    params->head, params->head_len);
-       NLA_PUT(msg, NL80211_ATTR_BEACON_HEAD, params->head_len, params->head);
        wpa_hexdump(MSG_DEBUG, "nl80211: Beacon tail",
                    params->tail, params->tail_len);
-       NLA_PUT(msg, NL80211_ATTR_BEACON_TAIL, params->tail_len, params->tail);
-       wpa_printf(MSG_DEBUG, "nl80211: ifindex=%d", ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
+       wpa_printf(MSG_DEBUG, "nl80211: ifindex=%d", bss->ifindex);
        wpa_printf(MSG_DEBUG, "nl80211: beacon_int=%d", params->beacon_int);
-       NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, params->beacon_int);
        wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period);
-       NLA_PUT_U32(msg, NL80211_ATTR_DTIM_PERIOD, params->dtim_period);
        wpa_hexdump_ascii(MSG_DEBUG, "nl80211: ssid",
                          params->ssid, params->ssid_len);
-       NLA_PUT(msg, NL80211_ATTR_SSID, params->ssid_len,
-               params->ssid);
+       if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
+           nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len,
+                   params->head) ||
+           nla_put(msg, NL80211_ATTR_BEACON_TAIL, params->tail_len,
+                   params->tail) ||
+           nl80211_put_beacon_int(msg, params->beacon_int) ||
+           nla_put_u32(msg, NL80211_ATTR_DTIM_PERIOD, params->dtim_period) ||
+           nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
+               goto fail;
        if (params->proberesp && params->proberesp_len) {
                wpa_hexdump(MSG_DEBUG, "nl80211: proberesp (offload)",
                            params->proberesp, params->proberesp_len);
-               NLA_PUT(msg, NL80211_ATTR_PROBE_RESP, params->proberesp_len,
-                       params->proberesp);
+               if (nla_put(msg, NL80211_ATTR_PROBE_RESP, params->proberesp_len,
+                           params->proberesp))
+                       goto fail;
        }
        switch (params->hide_ssid) {
        case NO_SSID_HIDING:
                wpa_printf(MSG_DEBUG, "nl80211: hidden SSID not in use");
-               NLA_PUT_U32(msg, NL80211_ATTR_HIDDEN_SSID,
-                           NL80211_HIDDEN_SSID_NOT_IN_USE);
+               if (nla_put_u32(msg, NL80211_ATTR_HIDDEN_SSID,
+                               NL80211_HIDDEN_SSID_NOT_IN_USE))
+                       goto fail;
                break;
        case HIDDEN_SSID_ZERO_LEN:
                wpa_printf(MSG_DEBUG, "nl80211: hidden SSID zero len");
-               NLA_PUT_U32(msg, NL80211_ATTR_HIDDEN_SSID,
-                           NL80211_HIDDEN_SSID_ZERO_LEN);
+               if (nla_put_u32(msg, NL80211_ATTR_HIDDEN_SSID,
+                               NL80211_HIDDEN_SSID_ZERO_LEN))
+                       goto fail;
                break;
        case HIDDEN_SSID_ZERO_CONTENTS:
                wpa_printf(MSG_DEBUG, "nl80211: hidden SSID zero contents");
-               NLA_PUT_U32(msg, NL80211_ATTR_HIDDEN_SSID,
-                           NL80211_HIDDEN_SSID_ZERO_CONTENTS);
+               if (nla_put_u32(msg, NL80211_ATTR_HIDDEN_SSID,
+                               NL80211_HIDDEN_SSID_ZERO_CONTENTS))
+                       goto fail;
                break;
        }
        wpa_printf(MSG_DEBUG, "nl80211: privacy=%d", params->privacy);
-       if (params->privacy)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_PRIVACY);
+       if (params->privacy &&
+           nla_put_flag(msg, NL80211_ATTR_PRIVACY))
+               goto fail;
        wpa_printf(MSG_DEBUG, "nl80211: auth_algs=0x%x", params->auth_algs);
        if ((params->auth_algs & (WPA_AUTH_ALG_OPEN | WPA_AUTH_ALG_SHARED)) ==
            (WPA_AUTH_ALG_OPEN | WPA_AUTH_ALG_SHARED)) {
                /* Leave out the attribute */
-       } else if (params->auth_algs & WPA_AUTH_ALG_SHARED)
-               NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE,
-                           NL80211_AUTHTYPE_SHARED_KEY);
-       else
-               NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE,
-                           NL80211_AUTHTYPE_OPEN_SYSTEM);
+       } else if (params->auth_algs & WPA_AUTH_ALG_SHARED) {
+               if (nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE,
+                               NL80211_AUTHTYPE_SHARED_KEY))
+                       goto fail;
+       } else {
+               if (nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE,
+                               NL80211_AUTHTYPE_OPEN_SYSTEM))
+                       goto fail;
+       }
 
        wpa_printf(MSG_DEBUG, "nl80211: wpa_version=0x%x", params->wpa_version);
        ver = 0;
@@ -4111,8 +3558,9 @@ static int wpa_driver_nl80211_set_ap(void *priv,
                ver |= NL80211_WPA_VERSION_1;
        if (params->wpa_version & WPA_PROTO_RSN)
                ver |= NL80211_WPA_VERSION_2;
-       if (ver)
-               NLA_PUT_U32(msg, NL80211_ATTR_WPA_VERSIONS, ver);
+       if (ver &&
+           nla_put_u32(msg, NL80211_ATTR_WPA_VERSIONS, ver))
+               goto fail;
 
        wpa_printf(MSG_DEBUG, "nl80211: key_mgmt_suites=0x%x",
                   params->key_mgmt_suites);
@@ -4121,74 +3569,105 @@ static int wpa_driver_nl80211_set_ap(void *priv,
                suites[num_suites++] = WLAN_AKM_SUITE_8021X;
        if (params->key_mgmt_suites & WPA_KEY_MGMT_PSK)
                suites[num_suites++] = WLAN_AKM_SUITE_PSK;
-       if (num_suites) {
-               NLA_PUT(msg, NL80211_ATTR_AKM_SUITES,
-                       num_suites * sizeof(u32), suites);
-       }
+       if (num_suites &&
+           nla_put(msg, NL80211_ATTR_AKM_SUITES, num_suites * sizeof(u32),
+                   suites))
+               goto fail;
 
-       if (params->key_mgmt_suites & WPA_KEY_MGMT_IEEE8021X &&
-           params->pairwise_ciphers & (WPA_CIPHER_WEP104 | WPA_CIPHER_WEP40))
-               NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT);
+       if (params->key_mgmt_suites & WPA_KEY_MGMT_IEEE8021X_NO_WPA &&
+           params->pairwise_ciphers & (WPA_CIPHER_WEP104 | WPA_CIPHER_WEP40) &&
+           nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT))
+               goto fail;
 
        wpa_printf(MSG_DEBUG, "nl80211: pairwise_ciphers=0x%x",
                   params->pairwise_ciphers);
        num_suites = wpa_cipher_to_cipher_suites(params->pairwise_ciphers,
                                                 suites, ARRAY_SIZE(suites));
-       if (num_suites) {
-               NLA_PUT(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
-                       num_suites * sizeof(u32), suites);
-       }
+       if (num_suites &&
+           nla_put(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
+                   num_suites * sizeof(u32), suites))
+               goto fail;
 
        wpa_printf(MSG_DEBUG, "nl80211: group_cipher=0x%x",
                   params->group_cipher);
        suite = wpa_cipher_to_cipher_suite(params->group_cipher);
-       if (suite)
-               NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, suite);
-
-       switch (params->smps_mode) {
-       case HT_CAP_INFO_SMPS_DYNAMIC:
-               wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - dynamic");
-               smps_mode = NL80211_SMPS_DYNAMIC;
-               break;
-       case HT_CAP_INFO_SMPS_STATIC:
-               wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - static");
-               smps_mode = NL80211_SMPS_STATIC;
-               break;
-       default:
-               /* invalid - fallback to smps off */
-       case HT_CAP_INFO_SMPS_DISABLED:
-               wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - off");
-               smps_mode = NL80211_SMPS_OFF;
-               break;
+       if (suite &&
+           nla_put_u32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, suite))
+               goto fail;
+
+       if (params->ht_opmode != -1) {
+               switch (params->smps_mode) {
+               case HT_CAP_INFO_SMPS_DYNAMIC:
+                       wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - dynamic");
+                       smps_mode = NL80211_SMPS_DYNAMIC;
+                       break;
+               case HT_CAP_INFO_SMPS_STATIC:
+                       wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - static");
+                       smps_mode = NL80211_SMPS_STATIC;
+                       break;
+               default:
+                       /* invalid - fallback to smps off */
+               case HT_CAP_INFO_SMPS_DISABLED:
+                       wpa_printf(MSG_DEBUG, "nl80211: SMPS mode - off");
+                       smps_mode = NL80211_SMPS_OFF;
+                       break;
+               }
+               if (nla_put_u32(msg, NL80211_ATTR_SMPS_MODE, smps_mode))
+                       goto fail;
        }
-       NLA_PUT_U32(msg, NL80211_ATTR_SMPS_MODE, smps_mode);
 
        if (params->beacon_ies) {
                wpa_hexdump_buf(MSG_DEBUG, "nl80211: beacon_ies",
                                params->beacon_ies);
-               NLA_PUT(msg, NL80211_ATTR_IE, wpabuf_len(params->beacon_ies),
-                       wpabuf_head(params->beacon_ies));
+               if (nla_put(msg, NL80211_ATTR_IE,
+                           wpabuf_len(params->beacon_ies),
+                           wpabuf_head(params->beacon_ies)))
+                       goto fail;
        }
        if (params->proberesp_ies) {
                wpa_hexdump_buf(MSG_DEBUG, "nl80211: proberesp_ies",
                                params->proberesp_ies);
-               NLA_PUT(msg, NL80211_ATTR_IE_PROBE_RESP,
-                       wpabuf_len(params->proberesp_ies),
-                       wpabuf_head(params->proberesp_ies));
+               if (nla_put(msg, NL80211_ATTR_IE_PROBE_RESP,
+                           wpabuf_len(params->proberesp_ies),
+                           wpabuf_head(params->proberesp_ies)))
+                       goto fail;
        }
        if (params->assocresp_ies) {
                wpa_hexdump_buf(MSG_DEBUG, "nl80211: assocresp_ies",
                                params->assocresp_ies);
-               NLA_PUT(msg, NL80211_ATTR_IE_ASSOC_RESP,
-                       wpabuf_len(params->assocresp_ies),
-                       wpabuf_head(params->assocresp_ies));
+               if (nla_put(msg, NL80211_ATTR_IE_ASSOC_RESP,
+                           wpabuf_len(params->assocresp_ies),
+                           wpabuf_head(params->assocresp_ies)))
+                       goto fail;
+       }
+
+       if (drv->capa.flags & WPA_DRIVER_FLAGS_INACTIVITY_TIMER)  {
+               wpa_printf(MSG_DEBUG, "nl80211: ap_max_inactivity=%d",
+                          params->ap_max_inactivity);
+               if (nla_put_u16(msg, NL80211_ATTR_INACTIVITY_TIMEOUT,
+                               params->ap_max_inactivity))
+                       goto fail;
+       }
+
+#ifdef CONFIG_P2P
+       if (params->p2p_go_ctwindow > 0) {
+               if (drv->p2p_go_ctwindow_supported) {
+                       wpa_printf(MSG_DEBUG, "nl80211: P2P GO ctwindow=%d",
+                                  params->p2p_go_ctwindow);
+                       if (nla_put_u8(msg, NL80211_ATTR_P2P_CTWINDOW,
+                                      params->p2p_go_ctwindow))
+                               goto fail;
+               } else {
+                       wpa_printf(MSG_INFO,
+                                  "nl80211: Driver does not support CTWindow configuration - ignore this parameter");
+               }
        }
+#endif /* CONFIG_P2P */
 
-       if (drv->capa.flags & WPA_DRIVER_FLAGS_INACTIVITY_TIMER)  {
-               wpa_printf(MSG_DEBUG, "nl80211: ap_max_inactivity=%d",
-                          params->ap_max_inactivity);
-               NLA_PUT_U16(msg, NL80211_ATTR_INACTIVITY_TIMEOUT,
-                           params->ap_max_inactivity);
+       if (params->pbss) {
+               wpa_printf(MSG_DEBUG, "nl80211: PBSS");
+               if (nla_put_flag(msg, NL80211_ATTR_PBSS))
+                       goto fail;
        }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
@@ -4226,65 +3705,80 @@ static int wpa_driver_nl80211_set_ap(void *priv,
                }
        }
        return ret;
- nla_put_failure:
+fail:
        nlmsg_free(msg);
        return -ENOBUFS;
 }
 
 
 static int nl80211_put_freq_params(struct nl_msg *msg,
-                                  struct hostapd_freq_params *freq)
+                                  const struct hostapd_freq_params *freq)
 {
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq->freq);
+       wpa_printf(MSG_DEBUG, "  * freq=%d", freq->freq);
+       if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq->freq))
+               return -ENOBUFS;
+
+       wpa_printf(MSG_DEBUG, "  * vht_enabled=%d", freq->vht_enabled);
+       wpa_printf(MSG_DEBUG, "  * ht_enabled=%d", freq->ht_enabled);
+
        if (freq->vht_enabled) {
+               enum nl80211_chan_width cw;
+
+               wpa_printf(MSG_DEBUG, "  * bandwidth=%d", freq->bandwidth);
                switch (freq->bandwidth) {
                case 20:
-                       NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
-                                   NL80211_CHAN_WIDTH_20);
+                       cw = NL80211_CHAN_WIDTH_20;
                        break;
                case 40:
-                       NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
-                                   NL80211_CHAN_WIDTH_40);
+                       cw = NL80211_CHAN_WIDTH_40;
                        break;
                case 80:
                        if (freq->center_freq2)
-                               NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
-                                           NL80211_CHAN_WIDTH_80P80);
+                               cw = NL80211_CHAN_WIDTH_80P80;
                        else
-                               NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
-                                           NL80211_CHAN_WIDTH_80);
+                               cw = NL80211_CHAN_WIDTH_80;
                        break;
                case 160:
-                       NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
-                                   NL80211_CHAN_WIDTH_160);
+                       cw = NL80211_CHAN_WIDTH_160;
                        break;
                default:
                        return -EINVAL;
                }
-               NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1, freq->center_freq1);
-               if (freq->center_freq2)
-                       NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ2,
-                                   freq->center_freq2);
+
+               wpa_printf(MSG_DEBUG, "  * channel_width=%d", cw);
+               wpa_printf(MSG_DEBUG, "  * center_freq1=%d",
+                          freq->center_freq1);
+               wpa_printf(MSG_DEBUG, "  * center_freq2=%d",
+                          freq->center_freq2);
+               if (nla_put_u32(msg, NL80211_ATTR_CHANNEL_WIDTH, cw) ||
+                   nla_put_u32(msg, NL80211_ATTR_CENTER_FREQ1,
+                               freq->center_freq1) ||
+                   (freq->center_freq2 &&
+                    nla_put_u32(msg, NL80211_ATTR_CENTER_FREQ2,
+                                freq->center_freq2)))
+                       return -ENOBUFS;
        } else if (freq->ht_enabled) {
+               enum nl80211_channel_type ct;
+
+               wpa_printf(MSG_DEBUG, "  * sec_channel_offset=%d",
+                          freq->sec_channel_offset);
                switch (freq->sec_channel_offset) {
                case -1:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-                                   NL80211_CHAN_HT40MINUS);
+                       ct = NL80211_CHAN_HT40MINUS;
                        break;
                case 1:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-                                   NL80211_CHAN_HT40PLUS);
+                       ct = NL80211_CHAN_HT40PLUS;
                        break;
                default:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-                                   NL80211_CHAN_HT20);
+                       ct = NL80211_CHAN_HT20;
                        break;
                }
+
+               wpa_printf(MSG_DEBUG, "  * channel_type=%d", ct);
+               if (nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, ct))
+                       return -ENOBUFS;
        }
        return 0;
-
-nla_put_failure:
-       return -ENOBUFS;
 }
 
 
@@ -4299,27 +3793,21 @@ static int nl80211_set_channel(struct i802_bss *bss,
                   "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,
                   freq->bandwidth, freq->center_freq1, freq->center_freq2);
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(drv, msg, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
-                   NL80211_CMD_SET_WIPHY);
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       if (nl80211_put_freq_params(msg, freq) < 0)
-               goto nla_put_failure;
+       msg = nl80211_drv_msg(drv, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
+                             NL80211_CMD_SET_WIPHY);
+       if (!msg || nl80211_put_freq_params(msg, freq) < 0) {
+               nlmsg_free(msg);
+               return -1;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret == 0) {
                bss->freq = freq->freq;
                return 0;
        }
        wpa_printf(MSG_DEBUG, "nl80211: Failed to set channel (freq=%d): "
                   "%d (%s)", freq->freq, ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
        return -1;
 }
 
@@ -4340,6 +3828,8 @@ static u32 sta_flags_nl80211(int flags)
                f |= BIT(NL80211_STA_FLAG_TDLS_PEER);
        if (flags & WPA_STA_AUTHENTICATED)
                f |= BIT(NL80211_STA_FLAG_AUTHENTICATED);
+       if (flags & WPA_STA_ASSOCIATED)
+               f |= BIT(NL80211_STA_FLAG_ASSOCIATED);
 
        return f;
 }
@@ -4349,11 +3839,11 @@ static u32 sta_flags_nl80211(int flags)
 static u32 sta_plink_state_nl80211(enum mesh_plink_state state)
 {
        switch (state) {
-       case PLINK_LISTEN:
+       case PLINK_IDLE:
                return NL80211_PLINK_LISTEN;
-       case PLINK_OPEN_SENT:
+       case PLINK_OPN_SNT:
                return NL80211_PLINK_OPN_SNT;
-       case PLINK_OPEN_RCVD:
+       case PLINK_OPN_RCVD:
                return NL80211_PLINK_OPN_RCVD;
        case PLINK_CNF_RCVD:
                return NL80211_PLINK_CNF_RCVD;
@@ -4385,123 +3875,188 @@ static int wpa_driver_nl80211_sta_add(void *priv,
            !(drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT))
                return -EOPNOTSUPP;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_printf(MSG_DEBUG, "nl80211: %s STA " MACSTR,
                   params->set ? "Set" : "Add", MAC2STR(params->addr));
-       nl80211_cmd(drv, msg, 0, params->set ? NL80211_CMD_SET_STATION :
-                   NL80211_CMD_NEW_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, params->addr);
+       msg = nl80211_bss_msg(bss, 0, params->set ? NL80211_CMD_SET_STATION :
+                             NL80211_CMD_NEW_STATION);
+       if (!msg || nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, params->addr))
+               goto fail;
 
-       if (!params->set || (params->flags & WPA_STA_TDLS_PEER)) {
-               NLA_PUT(msg, NL80211_ATTR_STA_SUPPORTED_RATES,
-                       params->supp_rates_len, params->supp_rates);
+       /*
+        * Set the below properties only in one of the following cases:
+        * 1. New station is added, already associated.
+        * 2. Set WPA_STA_TDLS_PEER station.
+        * 3. Set an already added unassociated station, if driver supports
+        * full AP client state. (Set these properties after station became
+        * associated will be rejected by the driver).
+        */
+       if (!params->set || (params->flags & WPA_STA_TDLS_PEER) ||
+           (params->set && FULL_AP_CLIENT_STATE_SUPP(drv->capa.flags) &&
+            (params->flags & WPA_STA_ASSOCIATED))) {
                wpa_hexdump(MSG_DEBUG, "  * supported rates",
                            params->supp_rates, params->supp_rates_len);
+               wpa_printf(MSG_DEBUG, "  * capability=0x%x",
+                          params->capability);
+               if (nla_put(msg, NL80211_ATTR_STA_SUPPORTED_RATES,
+                           params->supp_rates_len, params->supp_rates) ||
+                   nla_put_u16(msg, NL80211_ATTR_STA_CAPABILITY,
+                               params->capability))
+                       goto fail;
 
                if (params->ht_capabilities) {
                        wpa_hexdump(MSG_DEBUG, "  * ht_capabilities",
                                    (u8 *) params->ht_capabilities,
                                    sizeof(*params->ht_capabilities));
-                       NLA_PUT(msg, NL80211_ATTR_HT_CAPABILITY,
-                               sizeof(*params->ht_capabilities),
-                               params->ht_capabilities);
+                       if (nla_put(msg, NL80211_ATTR_HT_CAPABILITY,
+                                   sizeof(*params->ht_capabilities),
+                                   params->ht_capabilities))
+                               goto fail;
                }
 
                if (params->vht_capabilities) {
                        wpa_hexdump(MSG_DEBUG, "  * vht_capabilities",
                                    (u8 *) params->vht_capabilities,
                                    sizeof(*params->vht_capabilities));
-                       NLA_PUT(msg, NL80211_ATTR_VHT_CAPABILITY,
-                               sizeof(*params->vht_capabilities),
-                               params->vht_capabilities);
+                       if (nla_put(msg, NL80211_ATTR_VHT_CAPABILITY,
+                                   sizeof(*params->vht_capabilities),
+                                   params->vht_capabilities))
+                               goto fail;
                }
 
-               wpa_printf(MSG_DEBUG, "  * capability=0x%x",
-                          params->capability);
-               NLA_PUT_U16(msg, NL80211_ATTR_STA_CAPABILITY,
-                           params->capability);
-
                if (params->ext_capab) {
                        wpa_hexdump(MSG_DEBUG, "  * ext_capab",
                                    params->ext_capab, params->ext_capab_len);
-                       NLA_PUT(msg, NL80211_ATTR_STA_EXT_CAPABILITY,
-                               params->ext_capab_len, params->ext_capab);
+                       if (nla_put(msg, NL80211_ATTR_STA_EXT_CAPABILITY,
+                                   params->ext_capab_len, params->ext_capab))
+                               goto fail;
                }
+
+               if (is_ap_interface(drv->nlmode) &&
+                   nla_put_u8(msg, NL80211_ATTR_STA_SUPPORT_P2P_PS,
+                              params->support_p2p_ps ?
+                              NL80211_P2P_PS_SUPPORTED :
+                              NL80211_P2P_PS_UNSUPPORTED))
+                       goto fail;
        }
        if (!params->set) {
                if (params->aid) {
                        wpa_printf(MSG_DEBUG, "  * aid=%u", params->aid);
-                       NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, params->aid);
+                       if (nla_put_u16(msg, NL80211_ATTR_STA_AID, params->aid))
+                               goto fail;
                } else {
                        /*
                         * cfg80211 validates that AID is non-zero, so we have
                         * to make this a non-zero value for the TDLS case where
-                        * a dummy STA entry is used for now.
+                        * a dummy STA entry is used for now and for a station
+                        * that is still not associated.
                         */
-                       wpa_printf(MSG_DEBUG, "  * aid=1 (TDLS workaround)");
-                       NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, 1);
+                       wpa_printf(MSG_DEBUG, "  * aid=1 (%s workaround)",
+                                  (params->flags & WPA_STA_TDLS_PEER) ?
+                                  "TDLS" : "UNASSOC_STA");
+                       if (nla_put_u16(msg, NL80211_ATTR_STA_AID, 1))
+                               goto fail;
                }
                wpa_printf(MSG_DEBUG, "  * listen_interval=%u",
                           params->listen_interval);
-               NLA_PUT_U16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL,
-                           params->listen_interval);
+               if (nla_put_u16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL,
+                               params->listen_interval))
+                       goto fail;
        } else if (params->aid && (params->flags & WPA_STA_TDLS_PEER)) {
                wpa_printf(MSG_DEBUG, "  * peer_aid=%u", params->aid);
-               NLA_PUT_U16(msg, NL80211_ATTR_PEER_AID, params->aid);
+               if (nla_put_u16(msg, NL80211_ATTR_PEER_AID, params->aid))
+                       goto fail;
+       } else if (FULL_AP_CLIENT_STATE_SUPP(drv->capa.flags) &&
+                  (params->flags & WPA_STA_ASSOCIATED)) {
+               wpa_printf(MSG_DEBUG, "  * aid=%u", params->aid);
+               wpa_printf(MSG_DEBUG, "  * listen_interval=%u",
+                          params->listen_interval);
+               if (nla_put_u16(msg, NL80211_ATTR_STA_AID, params->aid) ||
+                   nla_put_u16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL,
+                               params->listen_interval))
+                       goto fail;
        }
 
        if (params->vht_opmode_enabled) {
                wpa_printf(MSG_DEBUG, "  * opmode=%u", params->vht_opmode);
-               NLA_PUT_U8(msg, NL80211_ATTR_OPMODE_NOTIF,
-                          params->vht_opmode);
+               if (nla_put_u8(msg, NL80211_ATTR_OPMODE_NOTIF,
+                              params->vht_opmode))
+                       goto fail;
        }
 
        if (params->supp_channels) {
                wpa_hexdump(MSG_DEBUG, "  * supported channels",
                            params->supp_channels, params->supp_channels_len);
-               NLA_PUT(msg, NL80211_ATTR_STA_SUPPORTED_CHANNELS,
-                       params->supp_channels_len, params->supp_channels);
+               if (nla_put(msg, NL80211_ATTR_STA_SUPPORTED_CHANNELS,
+                           params->supp_channels_len, params->supp_channels))
+                       goto fail;
        }
 
        if (params->supp_oper_classes) {
                wpa_hexdump(MSG_DEBUG, "  * supported operating classes",
                            params->supp_oper_classes,
                            params->supp_oper_classes_len);
-               NLA_PUT(msg, NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES,
-                       params->supp_oper_classes_len,
-                       params->supp_oper_classes);
+               if (nla_put(msg, NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES,
+                           params->supp_oper_classes_len,
+                           params->supp_oper_classes))
+                       goto fail;
        }
 
        os_memset(&upd, 0, sizeof(upd));
        upd.set = sta_flags_nl80211(params->flags);
        upd.mask = upd.set | sta_flags_nl80211(params->flags_mask);
+
+       /*
+        * If the driver doesn't support full AP client state, ignore ASSOC/AUTH
+        * flags, as nl80211 driver moves a new station, by default, into
+        * associated state.
+        *
+        * On the other hand, if the driver supports that feature and the
+        * station is added in unauthenticated state, set the
+        * authenticated/associated bits in the mask to prevent moving this
+        * station to associated state before it is actually associated.
+        *
+        * This is irrelevant for mesh mode where the station is added to the
+        * driver as authenticated already, and ASSOCIATED isn't part of the
+        * nl80211 API.
+        */
+       if (!is_mesh_interface(drv->nlmode)) {
+               if (!FULL_AP_CLIENT_STATE_SUPP(drv->capa.flags)) {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Ignore ASSOC/AUTH flags since driver doesn't support full AP client state");
+                       upd.mask &= ~(BIT(NL80211_STA_FLAG_ASSOCIATED) |
+                                     BIT(NL80211_STA_FLAG_AUTHENTICATED));
+               } else if (!params->set &&
+                          !(params->flags & WPA_STA_TDLS_PEER)) {
+                       if (!(params->flags & WPA_STA_AUTHENTICATED))
+                               upd.mask |= BIT(NL80211_STA_FLAG_AUTHENTICATED);
+                       if (!(params->flags & WPA_STA_ASSOCIATED))
+                               upd.mask |= BIT(NL80211_STA_FLAG_ASSOCIATED);
+               }
+       }
+
        wpa_printf(MSG_DEBUG, "  * flags set=0x%x mask=0x%x",
                   upd.set, upd.mask);
-       NLA_PUT(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd);
+       if (nla_put(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd))
+               goto fail;
 
 #ifdef CONFIG_MESH
-       if (params->plink_state)
-               NLA_PUT_U8(msg, NL80211_ATTR_STA_PLINK_STATE,
-                          sta_plink_state_nl80211(params->plink_state));
+       if (params->plink_state &&
+           nla_put_u8(msg, NL80211_ATTR_STA_PLINK_STATE,
+                      sta_plink_state_nl80211(params->plink_state)))
+               goto fail;
 #endif /* CONFIG_MESH */
 
        if (params->flags & WPA_STA_WMM) {
                struct nlattr *wme = nla_nest_start(msg, NL80211_ATTR_STA_WME);
 
-               if (!wme)
-                       goto nla_put_failure;
-
                wpa_printf(MSG_DEBUG, "  * qosinfo=0x%x", params->qosinfo);
-               NLA_PUT_U8(msg, NL80211_STA_WME_UAPSD_QUEUES,
-                               params->qosinfo & WMM_QOSINFO_STA_AC_MASK);
-               NLA_PUT_U8(msg, NL80211_STA_WME_MAX_SP,
-                               (params->qosinfo >> WMM_QOSINFO_STA_SP_SHIFT) &
-                               WMM_QOSINFO_STA_SP_MASK);
+               if (!wme ||
+                   nla_put_u8(msg, NL80211_STA_WME_UAPSD_QUEUES,
+                              params->qosinfo & WMM_QOSINFO_STA_AC_MASK) ||
+                   nla_put_u8(msg, NL80211_STA_WME_MAX_SP,
+                              (params->qosinfo >> WMM_QOSINFO_STA_SP_SHIFT) &
+                              WMM_QOSINFO_STA_SP_MASK))
+                       goto fail;
                nla_nest_end(msg, wme);
        }
 
@@ -4513,7 +4068,7 @@ static int wpa_driver_nl80211_sta_add(void *priv,
                           strerror(-ret));
        if (ret == -EEXIST)
                ret = 0;
- nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 }
@@ -4563,23 +4118,19 @@ static int wpa_driver_nl80211_sta_remove(struct i802_bss *bss, const u8 *addr,
        struct nl_msg *msg;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(bss->ifname));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       if (deauth == 0)
-               NLA_PUT_U8(msg, NL80211_ATTR_MGMT_SUBTYPE,
-                          WLAN_FC_STYPE_DISASSOC);
-       else if (deauth == 1)
-               NLA_PUT_U8(msg, NL80211_ATTR_MGMT_SUBTYPE,
-                          WLAN_FC_STYPE_DEAUTH);
-       if (reason_code)
-               NLA_PUT_U16(msg, NL80211_ATTR_REASON_CODE, reason_code);
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           (deauth == 0 &&
+            nla_put_u8(msg, NL80211_ATTR_MGMT_SUBTYPE,
+                       WLAN_FC_STYPE_DISASSOC)) ||
+           (deauth == 1 &&
+            nla_put_u8(msg, NL80211_ATTR_MGMT_SUBTYPE,
+                       WLAN_FC_STYPE_DEAUTH)) ||
+           (reason_code &&
+            nla_put_u16(msg, NL80211_ATTR_REASON_CODE, reason_code))) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        wpa_printf(MSG_DEBUG, "nl80211: sta_remove -> DEL_STATION %s " MACSTR
@@ -4592,9 +4143,6 @@ static int wpa_driver_nl80211_sta_remove(struct i802_bss *bss, const u8 *addr,
        if (ret == -ENOENT)
                return 0;
        return ret;
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -4608,25 +4156,20 @@ void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv, int ifidx)
        /* stop listening for EAPOL on this interface */
        dl_list_for_each(drv2, &drv->global->interfaces,
                         struct wpa_driver_nl80211_data, list)
-               del_ifidx(drv2, ifidx);
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto nla_put_failure;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_INTERFACE);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifidx);
+       {
+               del_ifidx(drv2, ifidx, IFIDX_ANY);
+               /* Remove all bridges learned for this iface */
+               del_ifidx(drv2, IFIDX_ANY, ifidx);
+       }
 
+       msg = nl80211_ifindex_msg(drv, ifidx, 0, NL80211_CMD_DEL_INTERFACE);
        if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
                return;
-       msg = NULL;
- nla_put_failure:
-       nlmsg_free(msg);
        wpa_printf(MSG_ERROR, "Failed to remove interface (ifidx=%d)", ifidx);
 }
 
 
-static const char * nl80211_iftype_str(enum nl80211_iftype mode)
+const char * nl80211_iftype_str(enum nl80211_iftype mode)
 {
        switch (mode) {
        case NL80211_IFTYPE_ADHOC:
@@ -4669,40 +4212,37 @@ static int nl80211_create_iface_once(struct wpa_driver_nl80211_data *drv,
        wpa_printf(MSG_DEBUG, "nl80211: Create interface iftype %d (%s)",
                   iftype, nl80211_iftype_str(iftype));
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_NEW_INTERFACE);
-       if (nl80211_set_iface_id(msg, drv->first_bss) < 0)
-               goto nla_put_failure;
-       NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, ifname);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, iftype);
+       msg = nl80211_cmd_msg(drv->first_bss, 0, NL80211_CMD_NEW_INTERFACE);
+       if (!msg ||
+           nla_put_string(msg, NL80211_ATTR_IFNAME, ifname) ||
+           nla_put_u32(msg, NL80211_ATTR_IFTYPE, iftype))
+               goto fail;
 
        if (iftype == NL80211_IFTYPE_MONITOR) {
                struct nlattr *flags;
 
                flags = nla_nest_start(msg, NL80211_ATTR_MNTR_FLAGS);
-               if (!flags)
-                       goto nla_put_failure;
-
-               NLA_PUT_FLAG(msg, NL80211_MNTR_FLAG_COOK_FRAMES);
+               if (!flags ||
+                   nla_put_flag(msg, NL80211_MNTR_FLAG_COOK_FRAMES))
+                       goto fail;
 
                nla_nest_end(msg, flags);
        } else if (wds) {
-               NLA_PUT_U8(msg, NL80211_ATTR_4ADDR, wds);
+               if (nla_put_u8(msg, NL80211_ATTR_4ADDR, wds))
+                       goto fail;
        }
 
        /*
         * Tell cfg80211 that the interface belongs to the socket that created
         * it, and the interface should be deleted when the socket is closed.
         */
-       NLA_PUT_FLAG(msg, NL80211_ATTR_IFACE_SOCKET_OWNER);
+       if (nla_put_flag(msg, NL80211_ATTR_IFACE_SOCKET_OWNER))
+               goto fail;
 
        ret = send_and_recv_msgs(drv, msg, handler, arg);
        msg = NULL;
        if (ret) {
nla_put_failure:
      fail:
                nlmsg_free(msg);
                wpa_printf(MSG_ERROR, "Failed to create interface %s: %d (%s)",
                           ifname, ret, strerror(-ret));
@@ -4728,7 +4268,7 @@ static int nl80211_create_iface_once(struct wpa_driver_nl80211_data *drv,
            iftype == NL80211_IFTYPE_WDS ||
            iftype == NL80211_IFTYPE_MONITOR) {
                /* start listening for EAPOL on this interface */
-               add_ifidx(drv, ifidx);
+               add_ifidx(drv, ifidx, IFIDX_ANY);
        }
 
        if (addr && iftype != NL80211_IFTYPE_MONITOR &&
@@ -4779,8 +4319,12 @@ int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
                                                wds, handler, arg);
        }
 
-       if (ret >= 0 && is_p2p_net_interface(iftype))
+       if (ret >= 0 && is_p2p_net_interface(iftype)) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Interface %s created for P2P - disable 11b rates",
+                          ifname);
                nl80211_disable_11b_rates(drv, ret, 1);
+       }
 
        return ret;
 }
@@ -4807,7 +4351,8 @@ static int nl80211_setup_ap(struct i802_bss *bss)
 
        if (drv->device_ap_sme && !drv->use_monitor)
                if (nl80211_mgmt_subscribe_ap_dev_sme(bss))
-                       return -1;
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Failed to subscribe for mgmt frames from SME driver - trying to run without it");
 
        if (!drv->device_ap_sme && drv->use_monitor &&
            nl80211_create_monitor_interface(drv) &&
@@ -4927,7 +4472,7 @@ static int wpa_driver_nl80211_hapd_send_eapol(
        memcpy(pos, data, data_len);
 
        res = wpa_driver_nl80211_send_frame(bss, (u8 *) hdr, len, encrypt, 0,
-                                           0, 0, 0, 0);
+                                           0, 0, 0, 0, NULL, 0);
        if (res < 0) {
                wpa_printf(MSG_ERROR, "i802_send_eapol - packet len: %lu - "
                           "failed: %d (%s)",
@@ -4940,11 +4485,11 @@ static int wpa_driver_nl80211_hapd_send_eapol(
 
 
 static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
-                                           int total_flags,
-                                           int flags_or, int flags_and)
+                                           unsigned int total_flags,
+                                           unsigned int flags_or,
+                                           unsigned int flags_and)
 {
        struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nlattr *flags;
        struct nl80211_sta_flag_update upd;
@@ -4954,47 +4499,38 @@ static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
                   bss->ifname, MAC2STR(addr), total_flags, flags_or, flags_and,
                   !!(total_flags & WPA_STA_AUTHORIZED));
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(bss->ifname));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr))
+               goto fail;
 
        /*
         * Backwards compatibility version using NL80211_ATTR_STA_FLAGS. This
         * can be removed eventually.
         */
        flags = nla_nest_start(msg, NL80211_ATTR_STA_FLAGS);
-       if (!flags)
-               goto nla_put_failure;
-       if (total_flags & WPA_STA_AUTHORIZED)
-               NLA_PUT_FLAG(msg, NL80211_STA_FLAG_AUTHORIZED);
-
-       if (total_flags & WPA_STA_WMM)
-               NLA_PUT_FLAG(msg, NL80211_STA_FLAG_WME);
-
-       if (total_flags & WPA_STA_SHORT_PREAMBLE)
-               NLA_PUT_FLAG(msg, NL80211_STA_FLAG_SHORT_PREAMBLE);
-
-       if (total_flags & WPA_STA_MFP)
-               NLA_PUT_FLAG(msg, NL80211_STA_FLAG_MFP);
-
-       if (total_flags & WPA_STA_TDLS_PEER)
-               NLA_PUT_FLAG(msg, NL80211_STA_FLAG_TDLS_PEER);
+       if (!flags ||
+           ((total_flags & WPA_STA_AUTHORIZED) &&
+            nla_put_flag(msg, NL80211_STA_FLAG_AUTHORIZED)) ||
+           ((total_flags & WPA_STA_WMM) &&
+            nla_put_flag(msg, NL80211_STA_FLAG_WME)) ||
+           ((total_flags & WPA_STA_SHORT_PREAMBLE) &&
+            nla_put_flag(msg, NL80211_STA_FLAG_SHORT_PREAMBLE)) ||
+           ((total_flags & WPA_STA_MFP) &&
+            nla_put_flag(msg, NL80211_STA_FLAG_MFP)) ||
+           ((total_flags & WPA_STA_TDLS_PEER) &&
+            nla_put_flag(msg, NL80211_STA_FLAG_TDLS_PEER)))
+               goto fail;
 
        nla_nest_end(msg, flags);
 
        os_memset(&upd, 0, sizeof(upd));
        upd.mask = sta_flags_nl80211(flags_or | ~flags_and);
        upd.set = sta_flags_nl80211(flags_or);
-       NLA_PUT(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd);
+       if (nla_put(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd))
+               goto fail;
 
-       return send_and_recv_msgs(drv, msg, NULL, NULL);
- nla_put_failure:
+       return send_and_recv_msgs(bss->drv, msg, NULL, NULL);
+fail:
        nlmsg_free(msg);
        return -ENOBUFS;
 }
@@ -5018,7 +4554,8 @@ static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv,
                return -1;
        }
 
-       if (nl80211_set_channel(drv->first_bss, &params->freq, 0)) {
+       if (params->freq.freq &&
+           nl80211_set_channel(drv->first_bss, &params->freq, 0)) {
                if (old_mode != nlmode)
                        wpa_driver_nl80211_set_mode(drv->first_bss, old_mode);
                nl80211_remove_monitor_interface(drv);
@@ -5029,40 +4566,75 @@ static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv,
 }
 
 
-static int nl80211_leave_ibss(struct wpa_driver_nl80211_data *drv)
+static int nl80211_leave_ibss(struct wpa_driver_nl80211_data *drv,
+                             int reset_mode)
 {
        struct nl_msg *msg;
-       int ret = -1;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
+       int ret;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_LEAVE_IBSS);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_LEAVE_IBSS);
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Leave IBSS failed: ret=%d "
                           "(%s)", ret, strerror(-ret));
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Leave IBSS request sent successfully");
        }
 
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: Leave IBSS request sent successfully");
-
-nla_put_failure:
-       if (wpa_driver_nl80211_set_mode(drv->first_bss,
+       if (reset_mode &&
+           wpa_driver_nl80211_set_mode(drv->first_bss,
                                        NL80211_IFTYPE_STATION)) {
                wpa_printf(MSG_INFO, "nl80211: Failed to set interface into "
                           "station mode");
        }
 
-       nlmsg_free(msg);
        return ret;
 }
 
 
+static int nl80211_ht_vht_overrides(struct nl_msg *msg,
+                                   struct wpa_driver_associate_params *params)
+{
+       if (params->disable_ht && nla_put_flag(msg, NL80211_ATTR_DISABLE_HT))
+               return -1;
+
+       if (params->htcaps && params->htcaps_mask) {
+               int sz = sizeof(struct ieee80211_ht_capabilities);
+               wpa_hexdump(MSG_DEBUG, "  * htcaps", params->htcaps, sz);
+               wpa_hexdump(MSG_DEBUG, "  * htcaps_mask",
+                           params->htcaps_mask, sz);
+               if (nla_put(msg, NL80211_ATTR_HT_CAPABILITY, sz,
+                           params->htcaps) ||
+                   nla_put(msg, NL80211_ATTR_HT_CAPABILITY_MASK, sz,
+                           params->htcaps_mask))
+                       return -1;
+       }
+
+#ifdef CONFIG_VHT_OVERRIDES
+       if (params->disable_vht) {
+               wpa_printf(MSG_DEBUG, "  * VHT disabled");
+               if (nla_put_flag(msg, NL80211_ATTR_DISABLE_VHT))
+                       return -1;
+       }
+
+       if (params->vhtcaps && params->vhtcaps_mask) {
+               int sz = sizeof(struct ieee80211_vht_capabilities);
+               wpa_hexdump(MSG_DEBUG, "  * vhtcaps", params->vhtcaps, sz);
+               wpa_hexdump(MSG_DEBUG, "  * vhtcaps_mask",
+                           params->vhtcaps_mask, sz);
+               if (nla_put(msg, NL80211_ATTR_VHT_CAPABILITY, sz,
+                           params->vhtcaps) ||
+                   nla_put(msg, NL80211_ATTR_VHT_CAPABILITY_MASK, sz,
+                           params->vhtcaps_mask))
+                       return -1;
+       }
+#endif /* CONFIG_VHT_OVERRIDES */
+
+       return 0;
+}
+
+
 static int wpa_driver_nl80211_ibss(struct wpa_driver_nl80211_data *drv,
                                   struct wpa_driver_associate_params *params)
 {
@@ -5079,48 +4651,36 @@ static int wpa_driver_nl80211_ibss(struct wpa_driver_nl80211_data *drv,
        }
 
 retry:
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_JOIN_IBSS);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       if (params->ssid == NULL || params->ssid_len > sizeof(drv->ssid))
-               goto nla_put_failure;
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_JOIN_IBSS)) ||
+           params->ssid == NULL || params->ssid_len > sizeof(drv->ssid))
+               goto fail;
 
        wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
                          params->ssid, params->ssid_len);
-       NLA_PUT(msg, NL80211_ATTR_SSID, params->ssid_len,
-               params->ssid);
+       if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
+               goto fail;
        os_memcpy(drv->ssid, params->ssid, params->ssid_len);
        drv->ssid_len = params->ssid_len;
 
-       wpa_printf(MSG_DEBUG, "  * freq=%d", params->freq.freq);
-       wpa_printf(MSG_DEBUG, "  * ht_enabled=%d", params->freq.ht_enabled);
-       wpa_printf(MSG_DEBUG, "  * sec_channel_offset=%d",
-                  params->freq.sec_channel_offset);
-       wpa_printf(MSG_DEBUG, "  * vht_enabled=%d", params->freq.vht_enabled);
-       wpa_printf(MSG_DEBUG, "  * center_freq1=%d", params->freq.center_freq1);
-       wpa_printf(MSG_DEBUG, "  * center_freq2=%d", params->freq.center_freq2);
-       wpa_printf(MSG_DEBUG, "  * bandwidth=%d", params->freq.bandwidth);
-       if (nl80211_put_freq_params(msg, &params->freq) < 0)
-               goto nla_put_failure;
-
-       if (params->beacon_int > 0) {
-               wpa_printf(MSG_DEBUG, "  * beacon_int=%d", params->beacon_int);
-               NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL,
-                           params->beacon_int);
-       }
+       if (nl80211_put_freq_params(msg, &params->freq) < 0 ||
+           nl80211_put_beacon_int(msg, params->beacon_int))
+               goto fail;
 
        ret = nl80211_set_conn_keys(params, msg);
        if (ret)
-               goto nla_put_failure;
+               goto fail;
 
        if (params->bssid && params->fixed_bssid) {
                wpa_printf(MSG_DEBUG, "  * BSSID=" MACSTR,
                           MAC2STR(params->bssid));
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid);
+               if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid))
+                       goto fail;
+       }
+
+       if (params->fixed_freq) {
+               wpa_printf(MSG_DEBUG, "  * fixed_freq");
+               if (nla_put_flag(msg, NL80211_ATTR_FREQ_FIXED))
+                       goto fail;
        }
 
        if (params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X ||
@@ -5128,17 +4688,23 @@ retry:
            params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SHA256 ||
            params->key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256) {
                wpa_printf(MSG_DEBUG, "  * control port");
-               NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT);
+               if (nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT))
+                       goto fail;
        }
 
        if (params->wpa_ie) {
                wpa_hexdump(MSG_DEBUG,
                            "  * Extra IEs for Beacon/Probe Response frames",
                            params->wpa_ie, params->wpa_ie_len);
-               NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len,
-                       params->wpa_ie);
+               if (nla_put(msg, NL80211_ATTR_IE, params->wpa_ie_len,
+                           params->wpa_ie))
+                       goto fail;
        }
 
+       ret = nl80211_ht_vht_overrides(msg, params);
+       if (ret < 0)
+               goto fail;
+
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        msg = NULL;
        if (ret) {
@@ -5148,17 +4714,16 @@ retry:
                if (ret == -EALREADY && count == 1) {
                        wpa_printf(MSG_DEBUG, "nl80211: Retry IBSS join after "
                                   "forced leave");
-                       nl80211_leave_ibss(drv);
+                       nl80211_leave_ibss(drv, 0);
                        nlmsg_free(msg);
                        goto retry;
                }
-
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Join IBSS request sent successfully");
        }
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: Join IBSS request sent successfully");
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 }
@@ -5168,56 +4733,61 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
                                  struct wpa_driver_associate_params *params,
                                  struct nl_msg *msg)
 {
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
        if (params->bssid) {
                wpa_printf(MSG_DEBUG, "  * bssid=" MACSTR,
                           MAC2STR(params->bssid));
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid);
+               if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, params->bssid))
+                       return -1;
        }
 
        if (params->bssid_hint) {
                wpa_printf(MSG_DEBUG, "  * bssid_hint=" MACSTR,
                           MAC2STR(params->bssid_hint));
-               NLA_PUT(msg, NL80211_ATTR_MAC_HINT, ETH_ALEN,
-                       params->bssid_hint);
+               if (nla_put(msg, NL80211_ATTR_MAC_HINT, ETH_ALEN,
+                           params->bssid_hint))
+                       return -1;
        }
 
        if (params->freq.freq) {
                wpa_printf(MSG_DEBUG, "  * freq=%d", params->freq.freq);
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq.freq);
+               if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
+                               params->freq.freq))
+                       return -1;
                drv->assoc_freq = params->freq.freq;
        } else
                drv->assoc_freq = 0;
 
        if (params->freq_hint) {
                wpa_printf(MSG_DEBUG, "  * freq_hint=%d", params->freq_hint);
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ_HINT,
-                           params->freq_hint);
+               if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ_HINT,
+                               params->freq_hint))
+                       return -1;
        }
 
        if (params->bg_scan_period >= 0) {
                wpa_printf(MSG_DEBUG, "  * bg scan period=%d",
                           params->bg_scan_period);
-               NLA_PUT_U16(msg, NL80211_ATTR_BG_SCAN_PERIOD,
-                           params->bg_scan_period);
+               if (nla_put_u16(msg, NL80211_ATTR_BG_SCAN_PERIOD,
+                               params->bg_scan_period))
+                       return -1;
        }
 
        if (params->ssid) {
                wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
                                  params->ssid, params->ssid_len);
-               NLA_PUT(msg, NL80211_ATTR_SSID, params->ssid_len,
-                       params->ssid);
+               if (nla_put(msg, NL80211_ATTR_SSID, params->ssid_len,
+                           params->ssid))
+                       return -1;
                if (params->ssid_len > sizeof(drv->ssid))
-                       goto nla_put_failure;
+                       return -1;
                os_memcpy(drv->ssid, params->ssid, params->ssid_len);
                drv->ssid_len = params->ssid_len;
        }
 
        wpa_hexdump(MSG_DEBUG, "  * IEs", params->wpa_ie, params->wpa_ie_len);
-       if (params->wpa_ie)
-               NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len,
-                       params->wpa_ie);
+       if (params->wpa_ie &&
+           nla_put(msg, NL80211_ATTR_IE, params->wpa_ie_len, params->wpa_ie))
+               return -1;
 
        if (params->wpa_proto) {
                enum nl80211_wpa_versions ver = 0;
@@ -5228,13 +4798,16 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
                        ver |= NL80211_WPA_VERSION_2;
 
                wpa_printf(MSG_DEBUG, "  * WPA Versions 0x%x", ver);
-               NLA_PUT_U32(msg, NL80211_ATTR_WPA_VERSIONS, ver);
+               if (nla_put_u32(msg, NL80211_ATTR_WPA_VERSIONS, ver))
+                       return -1;
        }
 
        if (params->pairwise_suite != WPA_CIPHER_NONE) {
                u32 cipher = wpa_cipher_to_cipher_suite(params->pairwise_suite);
                wpa_printf(MSG_DEBUG, "  * pairwise=0x%x", cipher);
-               NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE, cipher);
+               if (nla_put_u32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
+                               cipher))
+                       return -1;
        }
 
        if (params->group_suite == WPA_CIPHER_GTK_NOT_USED &&
@@ -5247,7 +4820,8 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
        } else if (params->group_suite != WPA_CIPHER_NONE) {
                u32 cipher = wpa_cipher_to_cipher_suite(params->group_suite);
                wpa_printf(MSG_DEBUG, "  * group=0x%x", cipher);
-               NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, cipher);
+               if (nla_put_u32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, cipher))
+                       return -1;
        }
 
        if (params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X ||
@@ -5258,7 +4832,8 @@ 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_IEEE8021X_SUITE_B) {
+           params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B ||
+           params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) {
                int mgmt = WLAN_AKM_SUITE_PSK;
 
                switch (params->key_mgmt_suite) {
@@ -5286,65 +4861,59 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
                case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
                        mgmt = WLAN_AKM_SUITE_8021X_SUITE_B;
                        break;
+               case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+                       mgmt = WLAN_AKM_SUITE_8021X_SUITE_B_192;
+                       break;
                case WPA_KEY_MGMT_PSK:
                default:
                        mgmt = WLAN_AKM_SUITE_PSK;
                        break;
                }
                wpa_printf(MSG_DEBUG, "  * akm=0x%x", mgmt);
-               NLA_PUT_U32(msg, NL80211_ATTR_AKM_SUITES, mgmt);
+               if (nla_put_u32(msg, NL80211_ATTR_AKM_SUITES, mgmt))
+                       return -1;
        }
 
-       NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT);
+       if (nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT))
+               return -1;
 
-       if (params->mgmt_frame_protection == MGMT_FRAME_PROTECTION_REQUIRED)
-               NLA_PUT_U32(msg, NL80211_ATTR_USE_MFP, NL80211_MFP_REQUIRED);
+       if (params->mgmt_frame_protection == MGMT_FRAME_PROTECTION_REQUIRED &&
+           nla_put_u32(msg, NL80211_ATTR_USE_MFP, NL80211_MFP_REQUIRED))
+               return -1;
 
        if (params->rrm_used) {
                u32 drv_rrm_flags = drv->capa.rrm_flags;
-               if (!(drv_rrm_flags &
-                     WPA_DRIVER_FLAGS_DS_PARAM_SET_IE_IN_PROBES) ||
-                   !(drv_rrm_flags & WPA_DRIVER_FLAGS_QUIET))
-                       goto nla_put_failure;
-               NLA_PUT_FLAG(msg, NL80211_ATTR_USE_RRM);
+               if ((!((drv_rrm_flags &
+                       WPA_DRIVER_FLAGS_DS_PARAM_SET_IE_IN_PROBES) &&
+                      (drv_rrm_flags & WPA_DRIVER_FLAGS_QUIET)) &&
+                    !(drv_rrm_flags & WPA_DRIVER_FLAGS_SUPPORT_RRM)) ||
+                   nla_put_flag(msg, NL80211_ATTR_USE_RRM))
+                       return -1;
        }
 
-       if (params->disable_ht)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_DISABLE_HT);
+       if (nl80211_ht_vht_overrides(msg, params) < 0)
+               return -1;
 
-       if (params->htcaps && params->htcaps_mask) {
-               int sz = sizeof(struct ieee80211_ht_capabilities);
-               wpa_hexdump(MSG_DEBUG, "  * htcaps", params->htcaps, sz);
-               NLA_PUT(msg, NL80211_ATTR_HT_CAPABILITY, sz, params->htcaps);
-               wpa_hexdump(MSG_DEBUG, "  * htcaps_mask",
-                           params->htcaps_mask, sz);
-               NLA_PUT(msg, NL80211_ATTR_HT_CAPABILITY_MASK, sz,
-                       params->htcaps_mask);
-       }
+       if (params->p2p)
+               wpa_printf(MSG_DEBUG, "  * P2P group");
 
-#ifdef CONFIG_VHT_OVERRIDES
-       if (params->disable_vht) {
-               wpa_printf(MSG_DEBUG, "  * VHT disabled");
-               NLA_PUT_FLAG(msg, NL80211_ATTR_DISABLE_VHT);
+       if (params->pbss) {
+               wpa_printf(MSG_DEBUG, "  * PBSS");
+               if (nla_put_flag(msg, NL80211_ATTR_PBSS))
+                       return -1;
        }
 
-       if (params->vhtcaps && params->vhtcaps_mask) {
-               int sz = sizeof(struct ieee80211_vht_capabilities);
-               wpa_hexdump(MSG_DEBUG, "  * vhtcaps", params->vhtcaps, sz);
-               NLA_PUT(msg, NL80211_ATTR_VHT_CAPABILITY, sz, params->vhtcaps);
-               wpa_hexdump(MSG_DEBUG, "  * vhtcaps_mask",
-                           params->vhtcaps_mask, sz);
-               NLA_PUT(msg, NL80211_ATTR_VHT_CAPABILITY_MASK, sz,
-                       params->vhtcaps_mask);
+       drv->connect_reassoc = 0;
+       if (params->prev_bssid) {
+               wpa_printf(MSG_DEBUG, "  * prev_bssid=" MACSTR,
+                          MAC2STR(params->prev_bssid));
+               if (nla_put(msg, NL80211_ATTR_PREV_BSSID, ETH_ALEN,
+                           params->prev_bssid))
+                       return -1;
+               drv->connect_reassoc = 1;
        }
-#endif /* CONFIG_VHT_OVERRIDES */
-
-       if (params->p2p)
-               wpa_printf(MSG_DEBUG, "  * P2P group");
 
        return 0;
-nla_put_failure:
-       return -1;
 }
 
 
@@ -5357,6 +4926,7 @@ static int wpa_driver_nl80211_try_connect(
        int ret;
        int algs;
 
+#ifdef CONFIG_DRIVER_NL80211_QCA
        if (params->req_key_mgmt_offload && params->psk &&
            (params->key_mgmt_suite == WPA_KEY_MGMT_PSK ||
             params->key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256 ||
@@ -5366,17 +4936,16 @@ static int wpa_driver_nl80211_try_connect(
                if (ret)
                        return ret;
        }
+#endif /* CONFIG_DRIVER_NL80211_QCA */
 
-       msg = nlmsg_alloc();
+       wpa_printf(MSG_DEBUG, "nl80211: Connect (ifindex=%d)", drv->ifindex);
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_CONNECT);
        if (!msg)
                return -1;
 
-       wpa_printf(MSG_DEBUG, "nl80211: Connect (ifindex=%d)", drv->ifindex);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_CONNECT);
-
        ret = nl80211_connect_common(drv, params, msg);
        if (ret)
-               goto nla_put_failure;
+               goto fail;
 
        algs = 0;
        if (params->auth_alg & WPA_AUTH_ALG_OPEN)
@@ -5400,27 +4969,28 @@ static int wpa_driver_nl80211_try_connect(
        else if (params->auth_alg & WPA_AUTH_ALG_FT)
                type = NL80211_AUTHTYPE_FT;
        else
-               goto nla_put_failure;
+               goto fail;
 
        wpa_printf(MSG_DEBUG, "  * Auth Type %d", type);
-       NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE, type);
+       if (nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE, type))
+               goto fail;
 
 skip_auth_type:
        ret = nl80211_set_conn_keys(params, msg);
        if (ret)
-               goto nla_put_failure;
+               goto fail;
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: MLME connect failed: ret=%d "
                           "(%s)", ret, strerror(-ret));
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Connect request send successfully");
        }
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: Connect request send successfully");
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 
@@ -5431,7 +5001,15 @@ static int wpa_driver_nl80211_connect(
        struct wpa_driver_nl80211_data *drv,
        struct wpa_driver_associate_params *params)
 {
-       int ret = wpa_driver_nl80211_try_connect(drv, params);
+       int ret;
+
+       /* Store the connection attempted bssid for future use */
+       if (params->bssid)
+               os_memcpy(drv->auth_attempt_bssid, params->bssid, ETH_ALEN);
+       else
+               os_memset(drv->auth_attempt_bssid, 0, ETH_ALEN);
+
+       ret = wpa_driver_nl80211_try_connect(drv, params);
        if (ret == -EALREADY) {
                /*
                 * cfg80211 does not currently accept new connections if
@@ -5455,9 +5033,11 @@ static int wpa_driver_nl80211_associate(
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
-       int ret;
+       int ret = -1;
        struct nl_msg *msg;
 
+       nl80211_unmask_11b_rates(bss);
+
        if (params->mode == IEEE80211_MODE_AP)
                return wpa_driver_nl80211_ap(drv, params);
 
@@ -5475,24 +5055,15 @@ static int wpa_driver_nl80211_associate(
 
        nl80211_mark_disconnected(drv);
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
        wpa_printf(MSG_DEBUG, "nl80211: Associate (ifindex=%d)",
                   drv->ifindex);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_ASSOCIATE);
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_ASSOCIATE);
+       if (!msg)
+               return -1;
 
        ret = nl80211_connect_common(drv, params, msg);
        if (ret)
-               goto nla_put_failure;
-
-       if (params->prev_bssid) {
-               wpa_printf(MSG_DEBUG, "  * prev_bssid=" MACSTR,
-                          MAC2STR(params->prev_bssid));
-               NLA_PUT(msg, NL80211_ATTR_PREV_BSSID, ETH_ALEN,
-                       params->prev_bssid);
-       }
+               goto fail;
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        msg = NULL;
@@ -5501,13 +5072,12 @@ static int wpa_driver_nl80211_associate(
                        "nl80211: MLME command failed (assoc): ret=%d (%s)",
                        ret, strerror(-ret));
                nl80211_dump_scan(drv);
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Association request send successfully");
        }
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: Association request send "
-                  "successfully");
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 }
@@ -5522,20 +5092,15 @@ static int nl80211_set_mode(struct wpa_driver_nl80211_data *drv,
        wpa_printf(MSG_DEBUG, "nl80211: Set mode ifindex %d iftype %d (%s)",
                   ifindex, mode, nl80211_iftype_str(mode));
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_INTERFACE);
-       if (nl80211_set_iface_id(msg, drv->first_bss) < 0)
-               goto nla_put_failure;
-       NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, mode);
+       msg = nl80211_cmd_msg(drv->first_bss, 0, NL80211_CMD_SET_INTERFACE);
+       if (!msg || nla_put_u32(msg, NL80211_ATTR_IFTYPE, mode))
+               goto fail;
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        msg = NULL;
        if (!ret)
                return 0;
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        wpa_printf(MSG_DEBUG, "nl80211: Failed to set interface %d to mode %d:"
                   " %d (%s)", ifindex, mode, ret, strerror(-ret));
@@ -5555,6 +5120,9 @@ static int wpa_driver_nl80211_set_mode_impl(
        int res;
        int mode_switch_res;
 
+       if (TEST_FAIL())
+               return -1;
+
        mode_switch_res = nl80211_set_mode(drv, drv->ifindex, nlmode);
        if (mode_switch_res && nlmode == nl80211_get_ifmode(bss))
                mode_switch_res = 0;
@@ -5597,7 +5165,7 @@ static int wpa_driver_nl80211_set_mode_impl(
                 * on a frequency that the mode is disallowed in.
                 */
                if (desired_freq_params) {
-                       res = i802_set_freq(bss, desired_freq_params);
+                       res = nl80211_set_channel(bss, desired_freq_params, 0);
                        if (res) {
                                wpa_printf(MSG_DEBUG,
                                           "nl80211: Failed to set frequency on interface");
@@ -5638,10 +5206,17 @@ done:
                return ret;
        }
 
-       if (is_p2p_net_interface(nlmode))
+       if (is_p2p_net_interface(nlmode)) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Interface %s mode change to P2P - disable 11b rates",
+                          bss->ifname);
                nl80211_disable_11b_rates(drv, drv->ifindex, 1);
-       else if (drv->disabled_11b_rates)
+       } else if (drv->disabled_11b_rates) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Interface %s mode changed to non-P2P - re-enable 11b rates",
+                          bss->ifname);
                nl80211_disable_11b_rates(drv, drv->ifindex, 0);
+       }
 
        if (is_ap_interface(nlmode)) {
                nl80211_mgmt_unsubscribe(bss, "start AP");
@@ -5723,7 +5298,7 @@ static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nl80211_sta_flag_update upd;
-       int ret = -ENOBUFS;
+       int ret;
 
        if (!drv->associated && is_zero_ether_addr(drv->bssid) && !authorized) {
                wpa_printf(MSG_DEBUG, "nl80211: Skip set_supp_port(unauthorized) while not associated");
@@ -5733,28 +5308,21 @@ static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
        wpa_printf(MSG_DEBUG, "nl80211: Set supplicant port %sauthorized for "
                   MACSTR, authorized ? "" : "un", MAC2STR(drv->bssid));
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(bss->ifname));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, drv->bssid);
-
        os_memset(&upd, 0, sizeof(upd));
        upd.mask = BIT(NL80211_STA_FLAG_AUTHORIZED);
        if (authorized)
                upd.set = BIT(NL80211_STA_FLAG_AUTHORIZED);
-       NLA_PUT(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd);
+
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, drv->bssid) ||
+           nla_put(msg, NL80211_ATTR_STA_FLAGS2, sizeof(upd), &upd)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (!ret)
                return 0;
- nla_put_failure:
-       nlmsg_free(msg);
        wpa_printf(MSG_DEBUG, "nl80211: Failed to set STA flag: %d (%s)",
                   ret, strerror(-ret));
        return ret;
@@ -5805,23 +5373,18 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_KEY);
-
-       if (addr)
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, idx);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(iface));
+       msg = nl80211_ifindex_msg(drv, if_nametoindex(iface), 0,
+                                 NL80211_CMD_GET_KEY);
+       if (!msg ||
+           (addr && nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) ||
+           nla_put_u8(msg, NL80211_ATTR_KEY_IDX, idx)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        memset(seq, 0, 6);
 
        return send_and_recv_msgs(drv, msg, get_key_handler, seq);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -5830,28 +5393,23 @@ static int i802_set_rts(void *priv, int rts)
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -ENOBUFS;
+       int ret;
        u32 val;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        if (rts >= 2347)
                val = (u32) -1;
        else
                val = rts;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_RTS_THRESHOLD, val);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_SET_WIPHY)) ||
+           nla_put_u32(msg, NL80211_ATTR_WIPHY_RTS_THRESHOLD, val)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (!ret)
                return 0;
-nla_put_failure:
-       nlmsg_free(msg);
        wpa_printf(MSG_DEBUG, "nl80211: Failed to set RTS threshold %d: "
                   "%d (%s)", rts, ret, strerror(-ret));
        return ret;
@@ -5863,28 +5421,23 @@ static int i802_set_frag(void *priv, int frag)
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -ENOBUFS;
+       int ret;
        u32 val;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        if (frag >= 2346)
                val = (u32) -1;
        else
                val = frag;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FRAG_THRESHOLD, val);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_SET_WIPHY)) ||
+           nla_put_u32(msg, NL80211_ATTR_WIPHY_FRAG_THRESHOLD, val)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (!ret)
                return 0;
-nla_put_failure:
-       nlmsg_free(msg);
        wpa_printf(MSG_DEBUG, "nl80211: Failed to set fragmentation threshold "
                   "%d: %d (%s)", frag, ret, strerror(-ret));
        return ret;
@@ -5894,33 +5447,22 @@ nla_put_failure:
 static int i802_flush(void *priv)
 {
        struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int res;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
        wpa_printf(MSG_DEBUG, "nl80211: flush -> DEL_STATION %s (all)",
                   bss->ifname);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_STATION);
 
        /*
         * XXX: FIX! this needs to flush all VLANs too
         */
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(bss->ifname));
-
-       res = send_and_recv_msgs(drv, msg, NULL, NULL);
+       msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_STATION);
+       res = send_and_recv_msgs(bss->drv, msg, NULL, NULL);
        if (res) {
                wpa_printf(MSG_DEBUG, "nl80211: Station flush failed: ret=%d "
                           "(%s)", res, strerror(-res));
        }
        return res;
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -5937,6 +5479,8 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
                [NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 },
                [NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 },
                [NL80211_STA_INFO_TX_FAILED] = { .type = NLA_U32 },
+               [NL80211_STA_INFO_RX_BYTES64] = { .type = NLA_U64 },
+               [NL80211_STA_INFO_TX_BYTES64] = { .type = NLA_U64 },
        };
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
@@ -5962,10 +5506,23 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
        if (stats[NL80211_STA_INFO_INACTIVE_TIME])
                data->inactive_msec =
                        nla_get_u32(stats[NL80211_STA_INFO_INACTIVE_TIME]);
+       /* For backwards compatibility, fetch the 32-bit counters first. */
        if (stats[NL80211_STA_INFO_RX_BYTES])
                data->rx_bytes = nla_get_u32(stats[NL80211_STA_INFO_RX_BYTES]);
        if (stats[NL80211_STA_INFO_TX_BYTES])
                data->tx_bytes = nla_get_u32(stats[NL80211_STA_INFO_TX_BYTES]);
+       if (stats[NL80211_STA_INFO_RX_BYTES64] &&
+           stats[NL80211_STA_INFO_TX_BYTES64]) {
+               /*
+                * The driver supports 64-bit counters, so use them to override
+                * the 32-bit values.
+                */
+               data->rx_bytes =
+                       nla_get_u64(stats[NL80211_STA_INFO_RX_BYTES64]);
+               data->tx_bytes =
+                       nla_get_u64(stats[NL80211_STA_INFO_TX_BYTES64]);
+               data->bytes_64bit = 1;
+       }
        if (stats[NL80211_STA_INFO_RX_PACKETS])
                data->rx_packets =
                        nla_get_u32(stats[NL80211_STA_INFO_RX_PACKETS]);
@@ -5983,23 +5540,17 @@ static int i802_read_sta_data(struct i802_bss *bss,
                              struct hostap_sta_driver_data *data,
                              const u8 *addr)
 {
-       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        os_memset(data, 0, sizeof(*data));
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_STATION);
-
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_GET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
-       return send_and_recv_msgs(drv, msg, get_sta_handler, data);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
+       return send_and_recv_msgs(bss->drv, msg, get_sta_handler, data);
 }
 
 
@@ -6011,43 +5562,45 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
        struct nl_msg *msg;
        struct nlattr *txq, *params;
 
-       msg = nlmsg_alloc();
+       msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_WIPHY);
        if (!msg)
                return -1;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
-
        txq = nla_nest_start(msg, NL80211_ATTR_WIPHY_TXQ_PARAMS);
        if (!txq)
-               goto nla_put_failure;
+               goto fail;
 
        /* We are only sending parameters for a single TXQ at a time */
        params = nla_nest_start(msg, 1);
        if (!params)
-               goto nla_put_failure;
+               goto fail;
 
        switch (queue) {
        case 0:
-               NLA_PUT_U8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_VO);
+               if (nla_put_u8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_VO))
+                       goto fail;
                break;
        case 1:
-               NLA_PUT_U8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_VI);
+               if (nla_put_u8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_VI))
+                       goto fail;
                break;
        case 2:
-               NLA_PUT_U8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_BE);
+               if (nla_put_u8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_BE))
+                       goto fail;
                break;
        case 3:
-               NLA_PUT_U8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_BK);
+               if (nla_put_u8(msg, NL80211_TXQ_ATTR_QUEUE, NL80211_TXQ_Q_BK))
+                       goto fail;
                break;
        }
        /* Burst time is configured in units of 0.1 msec and TXOP parameter in
         * 32 usec, so need to convert the value here. */
-       NLA_PUT_U16(msg, NL80211_TXQ_ATTR_TXOP, (burst_time * 100 + 16) / 32);
-       NLA_PUT_U16(msg, NL80211_TXQ_ATTR_CWMIN, cw_min);
-       NLA_PUT_U16(msg, NL80211_TXQ_ATTR_CWMAX, cw_max);
-       NLA_PUT_U8(msg, NL80211_TXQ_ATTR_AIFS, aifs);
+       if (nla_put_u16(msg, NL80211_TXQ_ATTR_TXOP,
+                       (burst_time * 100 + 16) / 32) ||
+           nla_put_u16(msg, NL80211_TXQ_ATTR_CWMIN, cw_min) ||
+           nla_put_u16(msg, NL80211_TXQ_ATTR_CWMAX, cw_max) ||
+           nla_put_u8(msg, NL80211_TXQ_ATTR_AIFS, aifs))
+               goto fail;
 
        nla_nest_end(msg, params);
 
@@ -6056,7 +5609,7 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
        if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
                return 0;
        msg = NULL;
- nla_put_failure:
+fail:
        nlmsg_free(msg);
        return -1;
 }
@@ -6067,34 +5620,26 @@ static int i802_set_sta_vlan(struct i802_bss *bss, const u8 *addr,
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = -ENOBUFS;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+       int ret;
 
        wpa_printf(MSG_DEBUG, "nl80211: %s[%d]: set_sta_vlan(" MACSTR
                   ", ifname=%s[%d], vlan_id=%d)",
                   bss->ifname, if_nametoindex(bss->ifname),
                   MAC2STR(addr), ifname, if_nametoindex(ifname), vlan_id);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_STATION);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(bss->ifname));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U32(msg, NL80211_ATTR_STA_VLAN,
-                   if_nametoindex(ifname));
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_STATION)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           nla_put_u32(msg, NL80211_ATTR_STA_VLAN, if_nametoindex(ifname))) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret < 0) {
                wpa_printf(MSG_ERROR, "nl80211: NL80211_ATTR_STA_VLAN (addr="
                           MACSTR " ifname=%s vlan_id=%d) failed: %d (%s)",
                           MAC2STR(addr), ifname, vlan_id, ret,
                           strerror(-ret));
        }
- nla_put_failure:
-       nlmsg_free(msg);
        return ret;
 }
 
@@ -6106,6 +5651,8 @@ static int i802_get_inact_sec(void *priv, const u8 *addr)
 
        data.inactive_msec = (unsigned long) -1;
        ret = i802_read_sta_data(priv, &data, addr);
+       if (ret == -ENOENT)
+               return -ENOENT;
        if (ret || data.inactive_msec == (unsigned long) -1)
                return -1;
        return data.inactive_msec / 1000;
@@ -6144,7 +5691,7 @@ static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
        return wpa_driver_nl80211_send_mlme(bss, (u8 *) &mgmt,
                                            IEEE80211_HDRLEN +
                                            sizeof(mgmt.u.deauth), 0, 0, 0, 0,
-                                           0);
+                                           0, NULL, 0);
 }
 
 
@@ -6171,7 +5718,7 @@ static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
        return wpa_driver_nl80211_send_mlme(bss, (u8 *) &mgmt,
                                            IEEE80211_HDRLEN +
                                            sizeof(mgmt.u.disassoc), 0, 0, 0, 0,
-                                           0);
+                                           0, NULL, 0);
 }
 
 
@@ -6186,8 +5733,10 @@ static void dump_ifidx(struct wpa_driver_nl80211_data *drv)
        for (i = 0; i < drv->num_if_indices; i++) {
                if (!drv->if_indices[i])
                        continue;
-               res = os_snprintf(pos, end - pos, " %d", drv->if_indices[i]);
-               if (res < 0 || res >= end - pos)
+               res = os_snprintf(pos, end - pos, " %d(%d)",
+                                 drv->if_indices[i],
+                                 drv->if_indices_reason[i]);
+               if (os_snprintf_error(end - pos, res))
                        break;
                pos += res;
        }
@@ -6198,14 +5747,16 @@ static void dump_ifidx(struct wpa_driver_nl80211_data *drv)
 }
 
 
-static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
+static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason)
 {
        int i;
-       int *old;
+       int *old, *old_reason;
 
-       wpa_printf(MSG_DEBUG, "nl80211: Add own interface ifindex %d",
-                  ifidx);
-       if (have_ifidx(drv, ifidx)) {
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: Add own interface ifindex %d (ifidx_reason %d)",
+                  ifidx, ifidx_reason);
+       if (have_ifidx(drv, ifidx, ifidx_reason)) {
                wpa_printf(MSG_DEBUG, "nl80211: ifindex %d already in the list",
                           ifidx);
                return;
@@ -6213,6 +5764,7 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
        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;
                        dump_ifidx(drv);
                        return;
                }
@@ -6223,32 +5775,57 @@ 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));
        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);
                return;
-       } else if (!old)
+       }
+       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->num_if_indices++;
        dump_ifidx(drv);
 }
 
 
-static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
+static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason)
 {
        int i;
 
        for (i = 0; i < drv->num_if_indices; i++) {
-               if (drv->if_indices[i] == ifidx) {
+               if ((drv->if_indices[i] == ifidx || ifidx == IFIDX_ANY) &&
+                   (drv->if_indices_reason[i] == ifidx_reason ||
+                    ifidx_reason == IFIDX_ANY)) {
                        drv->if_indices[i] = 0;
                        break;
                }
@@ -6257,12 +5834,15 @@ static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
 }
 
 
-static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
+static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+                     int ifidx_reason)
 {
        int i;
 
        for (i = 0; i < drv->num_if_indices; i++)
-               if (drv->if_indices[i] == ifidx)
+               if (drv->if_indices[i] == ifidx &&
+                   (drv->if_indices_reason[i] == ifidx_reason ||
+                    ifidx_reason == IFIDX_ANY))
                        return 1;
 
        return 0;
@@ -6327,7 +5907,7 @@ static void handle_eapol(int sock, void *eloop_ctx, void *sock_ctx)
                return;
        }
 
-       if (have_ifidx(drv, lladdr.sll_ifindex))
+       if (have_ifidx(drv, lladdr.sll_ifindex, IFIDX_ANY))
                drv_event_eapol_rx(drv->ctx, lladdr.sll_addr, buf, len);
 }
 
@@ -6341,7 +5921,6 @@ static int i802_check_bridge(struct wpa_driver_nl80211_data *drv,
 
        os_strlcpy(bss->brname, brname, IFNAMSIZ);
        br_ifindex = if_nametoindex(brname);
-       bss->br_ifindex = br_ifindex;
        if (br_ifindex == 0) {
                /*
                 * Bridge was configured, but the bridge device does
@@ -6354,8 +5933,10 @@ static int i802_check_bridge(struct wpa_driver_nl80211_data *drv,
                        return -1;
                }
                bss->added_bridge = 1;
-               add_ifidx(drv, if_nametoindex(brname));
+               br_ifindex = if_nametoindex(brname);
+               add_ifidx(drv, br_ifindex, drv->ifindex);
        }
+       bss->br_ifindex = br_ifindex;
 
        if (linux_br_get(in_br, ifname) == 0) {
                if (os_strcmp(in_br, brname) == 0)
@@ -6393,48 +5974,67 @@ static void *i802_init(struct hostapd_data *hapd,
        struct wpa_driver_nl80211_data *drv;
        struct i802_bss *bss;
        size_t i;
-       char brname[IFNAMSIZ];
-       int ifindex, br_ifindex;
+       char master_ifname[IFNAMSIZ];
+       int ifindex, br_ifindex = 0;
        int br_added = 0;
 
        bss = wpa_driver_nl80211_drv_init(hapd, params->ifname,
                                          params->global_priv, 1,
-                                         params->bssid);
+                                         params->bssid, params->driver_params);
        if (bss == NULL)
                return NULL;
 
        drv = bss->drv;
 
-       if (linux_br_get(brname, params->ifname) == 0) {
+       if (linux_br_get(master_ifname, params->ifname) == 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Interface %s is in bridge %s",
-                          params->ifname, brname);
-               br_ifindex = if_nametoindex(brname);
-               os_strlcpy(bss->brname, brname, IFNAMSIZ);
+                          params->ifname, master_ifname);
+               br_ifindex = if_nametoindex(master_ifname);
+               os_strlcpy(bss->brname, master_ifname, IFNAMSIZ);
+       } else if ((params->num_bridge == 0 || !params->bridge[0]) &&
+                  linux_master_get(master_ifname, params->ifname) == 0) {
+               wpa_printf(MSG_DEBUG, "nl80211: Interface %s is in master %s",
+                       params->ifname, master_ifname);
+               /* start listening for EAPOL on the master interface */
+               add_ifidx(drv, if_nametoindex(master_ifname), drv->ifindex);
+
+               /* check if master itself is under bridge */
+               if (linux_br_get(master_ifname, master_ifname) == 0) {
+                       wpa_printf(MSG_DEBUG, "nl80211: which is in bridge %s",
+                                  master_ifname);
+                       br_ifindex = if_nametoindex(master_ifname);
+                       os_strlcpy(bss->brname, master_ifname, IFNAMSIZ);
+               }
        } else {
-               brname[0] = '\0';
-               br_ifindex = 0;
+               master_ifname[0] = '\0';
        }
+
        bss->br_ifindex = br_ifindex;
 
        for (i = 0; i < params->num_bridge; i++) {
                if (params->bridge[i]) {
                        ifindex = if_nametoindex(params->bridge[i]);
                        if (ifindex)
-                               add_ifidx(drv, ifindex);
+                               add_ifidx(drv, ifindex, drv->ifindex);
                        if (ifindex == br_ifindex)
                                br_added = 1;
                }
        }
-       if (!br_added && br_ifindex &&
-           (params->num_bridge == 0 || !params->bridge[0]))
-               add_ifidx(drv, br_ifindex);
 
        /* start listening for EAPOL on the default AP interface */
-       add_ifidx(drv, drv->ifindex);
+       add_ifidx(drv, drv->ifindex, IFIDX_ANY);
 
-       if (params->num_bridge && params->bridge[0] &&
-           i802_check_bridge(drv, bss, params->bridge[0], params->ifname) < 0)
-               goto failed;
+       if (params->num_bridge && params->bridge[0]) {
+               if (i802_check_bridge(drv, bss, params->bridge[0],
+                                     params->ifname) < 0)
+                       goto failed;
+               if (os_strcmp(params->bridge[0], master_ifname) != 0)
+                       br_added = 1;
+       }
+
+       if (!br_added && br_ifindex &&
+           (params->num_bridge == 0 || !params->bridge[0]))
+               add_ifidx(drv, br_ifindex, drv->ifindex);
 
 #ifdef CONFIG_LIBNL3_ROUTE
        if (bss->added_if_into_bridge) {
@@ -6504,13 +6104,14 @@ static enum nl80211_iftype wpa_driver_nl80211_if_type(
                return NL80211_IFTYPE_P2P_GO;
        case WPA_IF_P2P_DEVICE:
                return NL80211_IFTYPE_P2P_DEVICE;
+       case WPA_IF_MESH:
+               return NL80211_IFTYPE_MESH_POINT;
+       default:
+               return -1;
        }
-       return -1;
 }
 
 
-#ifdef CONFIG_P2P
-
 static int nl80211_addr_in_use(struct nl80211_global *global, const u8 *addr)
 {
        struct wpa_driver_nl80211_data *drv;
@@ -6523,8 +6124,7 @@ static int nl80211_addr_in_use(struct nl80211_global *global, const u8 *addr)
 }
 
 
-static int nl80211_p2p_interface_addr(struct wpa_driver_nl80211_data *drv,
-                                     u8 *new_addr)
+static int nl80211_vif_addr(struct wpa_driver_nl80211_data *drv, u8 *new_addr)
 {
        unsigned int idx;
 
@@ -6541,14 +6141,12 @@ static int nl80211_p2p_interface_addr(struct wpa_driver_nl80211_data *drv,
        if (idx == 64)
                return -1;
 
-       wpa_printf(MSG_DEBUG, "nl80211: Assigned new P2P Interface Address "
+       wpa_printf(MSG_DEBUG, "nl80211: Assigned new virtual interface address "
                   MACSTR, MAC2STR(new_addr));
 
        return 0;
 }
 
-#endif /* CONFIG_P2P */
-
 
 struct wdev_info {
        u64 wdev_id;
@@ -6581,7 +6179,8 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
                                     const char *ifname, const u8 *addr,
                                     void *bss_ctx, void **drv_priv,
                                     char *force_ifname, u8 *if_addr,
-                                    const char *bridge, int use_existing)
+                                    const char *bridge, int use_existing,
+                                    int setup_ap)
 {
        enum nl80211_iftype nlmode;
        struct i802_bss *bss = priv;
@@ -6624,21 +6223,21 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
        }
 
        if (!addr) {
-               if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
+               if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
                        os_memcpy(if_addr, bss->addr, ETH_ALEN);
                else if (linux_get_ifhwaddr(drv->global->ioctl_sock,
-                                           bss->ifname, if_addr) < 0) {
+                                           ifname, if_addr) < 0) {
                        if (added)
                                nl80211_remove_iface(drv, ifidx);
                        return -1;
                }
        }
 
-#ifdef CONFIG_P2P
        if (!addr &&
            (type == WPA_IF_P2P_CLIENT || type == WPA_IF_P2P_GROUP ||
-            type == WPA_IF_P2P_GO)) {
-               /* Enforce unique P2P Interface Address */
+            type == WPA_IF_P2P_GO || type == WPA_IF_MESH ||
+            type == WPA_IF_STATION)) {
+               /* Enforce unique address */
                u8 new_addr[ETH_ALEN];
 
                if (linux_get_ifhwaddr(drv->global->ioctl_sock, ifname,
@@ -6649,8 +6248,8 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
                }
                if (nl80211_addr_in_use(drv->global, new_addr)) {
                        wpa_printf(MSG_DEBUG, "nl80211: Allocate new address "
-                                  "for P2P group interface");
-                       if (nl80211_p2p_interface_addr(drv, new_addr) < 0) {
+                                  "for interface %s type %d", ifname, type);
+                       if (nl80211_vif_addr(drv, new_addr) < 0) {
                                if (added)
                                        nl80211_remove_iface(drv, ifidx);
                                return -1;
@@ -6664,9 +6263,8 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
                }
                os_memcpy(if_addr, new_addr, ETH_ALEN);
        }
-#endif /* CONFIG_P2P */
 
-       if (type == WPA_IF_AP_BSS) {
+       if (type == WPA_IF_AP_BSS && setup_ap) {
                struct i802_bss *new_bss = os_zalloc(sizeof(*new_bss));
                if (new_bss == NULL) {
                        if (added)
@@ -6722,7 +6320,7 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
             nlmode == NL80211_IFTYPE_AP_VLAN ||
             nlmode == NL80211_IFTYPE_WDS ||
             nlmode == NL80211_IFTYPE_MONITOR))
-               add_ifidx(drv, ifidx);
+               add_ifidx(drv, ifidx, IFIDX_ANY);
 
        return 0;
 }
@@ -6742,8 +6340,10 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
        else if (ifindex > 0 && !bss->added_if) {
                struct wpa_driver_nl80211_data *drv2;
                dl_list_for_each(drv2, &drv->global->interfaces,
-                                struct wpa_driver_nl80211_data, list)
-                       del_ifidx(drv2, ifindex);
+                                struct wpa_driver_nl80211_data, list) {
+                       del_ifidx(drv2, ifindex, IFIDX_ANY);
+                       del_ifidx(drv2, IFIDX_ANY, ifindex);
+               }
        }
 
        if (type != WPA_IF_AP_BSS)
@@ -6821,38 +6421,31 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,
                                  unsigned int freq, unsigned int wait,
                                  const u8 *buf, size_t buf_len,
                                  u64 *cookie_out, int no_cck, int no_ack,
-                                 int offchanok)
+                                 int offchanok, const u16 *csa_offs,
+                                 size_t csa_offs_len)
 {
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        u64 cookie;
        int ret = -1;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
-
        wpa_printf(MSG_MSGDUMP, "nl80211: CMD_FRAME freq=%u wait=%u no_cck=%d "
                   "no_ack=%d offchanok=%d",
                   freq, wait, no_cck, no_ack, offchanok);
        wpa_hexdump(MSG_MSGDUMP, "CMD_FRAME", buf, buf_len);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_FRAME);
 
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-       if (freq)
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
-       if (wait)
-               NLA_PUT_U32(msg, NL80211_ATTR_DURATION, wait);
-       if (offchanok && ((drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) ||
-                         drv->test_use_roc_tx))
-               NLA_PUT_FLAG(msg, NL80211_ATTR_OFFCHANNEL_TX_OK);
-       if (no_cck)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_TX_NO_CCK_RATE);
-       if (no_ack)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_DONT_WAIT_FOR_ACK);
-
-       NLA_PUT(msg, NL80211_ATTR_FRAME, buf_len, buf);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_FRAME)) ||
+           (freq && nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq)) ||
+           (wait && nla_put_u32(msg, NL80211_ATTR_DURATION, wait)) ||
+           (offchanok && ((drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) ||
+                          drv->test_use_roc_tx) &&
+            nla_put_flag(msg, NL80211_ATTR_OFFCHANNEL_TX_OK)) ||
+           (no_cck && nla_put_flag(msg, NL80211_ATTR_TX_NO_CCK_RATE)) ||
+           (no_ack && nla_put_flag(msg, NL80211_ATTR_DONT_WAIT_FOR_ACK)) ||
+           (csa_offs && nla_put(msg, NL80211_ATTR_CSA_C_OFFSETS_TX,
+                                csa_offs_len * sizeof(u16), csa_offs)) ||
+           nla_put(msg, NL80211_ATTR_FRAME, buf_len, buf))
+               goto fail;
 
        cookie = 0;
        ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie);
@@ -6861,16 +6454,30 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,
                wpa_printf(MSG_DEBUG, "nl80211: Frame command failed: ret=%d "
                           "(%s) (freq=%u wait=%u)", ret, strerror(-ret),
                           freq, wait);
-               goto nla_put_failure;
-       }
-       wpa_printf(MSG_MSGDUMP, "nl80211: Frame TX command accepted%s; "
-                  "cookie 0x%llx", no_ack ? " (no ACK)" : "",
-                  (long long unsigned int) cookie);
+       } else {
+               wpa_printf(MSG_MSGDUMP, "nl80211: Frame TX command accepted%s; "
+                          "cookie 0x%llx", no_ack ? " (no ACK)" : "",
+                          (long long unsigned int) cookie);
+
+               if (cookie_out)
+                       *cookie_out = no_ack ? (u64) -1 : cookie;
 
-       if (cookie_out)
-               *cookie_out = no_ack ? (u64) -1 : cookie;
+               if (drv->num_send_action_cookies == MAX_SEND_ACTION_COOKIES) {
+                       wpa_printf(MSG_DEBUG,
+                                  "nl80211: Drop oldest pending send action cookie 0x%llx",
+                                  (long long unsigned int)
+                                  drv->send_action_cookies[0]);
+                       os_memmove(&drv->send_action_cookies[0],
+                                  &drv->send_action_cookies[1],
+                                  (MAX_SEND_ACTION_COOKIES - 1) *
+                                  sizeof(u64));
+                       drv->num_send_action_cookies--;
+               }
+               drv->send_action_cookies[drv->num_send_action_cookies] = cookie;
+               drv->num_send_action_cookies++;
+       }
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return ret;
 }
@@ -6910,45 +6517,60 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss,
             !drv->use_monitor))
                ret = wpa_driver_nl80211_send_mlme(bss, buf, 24 + data_len,
                                                   0, freq, no_cck, 1,
-                                                  wait_time);
+                                                  wait_time, NULL, 0);
        else
                ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf,
                                             24 + data_len,
                                             &drv->send_action_cookie,
-                                            no_cck, 0, 1);
+                                            no_cck, 0, 1, NULL, 0);
 
        os_free(buf);
        return ret;
 }
 
 
-static void wpa_driver_nl80211_send_action_cancel_wait(void *priv)
+static void nl80211_frame_wait_cancel(struct i802_bss *bss, u64 cookie)
 {
-       struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return;
-
        wpa_printf(MSG_DEBUG, "nl80211: Cancel TX frame wait: cookie=0x%llx",
-                  (long long unsigned int) drv->send_action_cookie);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_FRAME_WAIT_CANCEL);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-       NLA_PUT_U64(msg, NL80211_ATTR_COOKIE, drv->send_action_cookie);
+                  (long long unsigned int) cookie);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_FRAME_WAIT_CANCEL)) ||
+           nla_put_u64(msg, NL80211_ATTR_COOKIE, cookie)) {
+               nlmsg_free(msg);
+               return;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: wait cancel failed: ret=%d "
                           "(%s)", ret, strerror(-ret));
+}
 
- nla_put_failure:
-       nlmsg_free(msg);
+
+static void wpa_driver_nl80211_send_action_cancel_wait(void *priv)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       unsigned int i;
+       u64 cookie;
+
+       /* Cancel the last pending TX cookie */
+       nl80211_frame_wait_cancel(bss, drv->send_action_cookie);
+
+       /*
+        * Cancel the other pending TX cookies, if any. This is needed since
+        * the driver may keep a list of all pending offchannel TX operations
+        * and free up the radio only once they have expired or cancelled.
+        */
+       for (i = drv->num_send_action_cookies; i > 0; i--) {
+               cookie = drv->send_action_cookies[i - 1];
+               if (cookie != drv->send_action_cookie)
+                       nl80211_frame_wait_cancel(bss, cookie);
+       }
+       drv->num_send_action_cookies = 0;
 }
 
 
@@ -6961,21 +6583,15 @@ static int wpa_driver_nl80211_remain_on_channel(void *priv, unsigned int freq,
        int ret;
        u64 cookie;
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_REMAIN_ON_CHANNEL)) ||
+           nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq) ||
+           nla_put_u32(msg, NL80211_ATTR_DURATION, duration)) {
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_REMAIN_ON_CHANNEL);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
-       NLA_PUT_U32(msg, NL80211_ATTR_DURATION, duration);
+       }
 
        cookie = 0;
        ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie);
-       msg = NULL;
        if (ret == 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Remain-on-channel cookie "
                           "0x%llx for freq=%u MHz duration=%u",
@@ -6987,8 +6603,6 @@ static int wpa_driver_nl80211_remain_on_channel(void *priv, unsigned int freq,
        wpa_printf(MSG_DEBUG, "nl80211: Failed to request remain-on-channel "
                   "(freq=%d duration=%u): %d (%s)",
                   freq, duration, ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
        return -1;
 }
 
@@ -7010,25 +6624,18 @@ static int wpa_driver_nl80211_cancel_remain_on_channel(void *priv)
                   "0x%llx",
                   (long long unsigned int) drv->remain_on_chan_cookie);
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL);
+       if (!msg ||
+           nla_put_u64(msg, NL80211_ATTR_COOKIE, drv->remain_on_chan_cookie)) {
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL);
-
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-
-       NLA_PUT_U64(msg, NL80211_ATTR_COOKIE, drv->remain_on_chan_cookie);
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret == 0)
                return 0;
        wpa_printf(MSG_DEBUG, "nl80211: Failed to cancel remain-on-channel: "
                   "%d (%s)", ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
        return -1;
 }
 
@@ -7093,16 +6700,19 @@ static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
        struct nlattr *bands, *band;
        int ret;
 
-       msg = nlmsg_alloc();
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: NL80211_CMD_SET_TX_BITRATE_MASK (ifindex=%d %s)",
+                  ifindex, disabled ? "NL80211_TXRATE_LEGACY=OFDM-only" :
+                  "no NL80211_TXRATE_LEGACY constraint");
+
+       msg = nl80211_ifindex_msg(drv, ifindex, 0,
+                                 NL80211_CMD_SET_TX_BITRATE_MASK);
        if (!msg)
                return -1;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_TX_BITRATE_MASK);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
-
        bands = nla_nest_start(msg, NL80211_ATTR_TX_RATES);
        if (!bands)
-               goto nla_put_failure;
+               goto fail;
 
        /*
         * Disable 2 GHz rates 1, 2, 5.5, 11 Mbps by masking out everything
@@ -7110,18 +6720,15 @@ static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
         * rates. All 5 GHz rates are left enabled.
         */
        band = nla_nest_start(msg, NL80211_BAND_2GHZ);
-       if (!band)
-               goto nla_put_failure;
-       if (disabled) {
-               NLA_PUT(msg, NL80211_TXRATE_LEGACY, 8,
-                       "\x0c\x12\x18\x24\x30\x48\x60\x6c");
-       }
+       if (!band ||
+           (disabled && nla_put(msg, NL80211_TXRATE_LEGACY, 8,
+                                "\x0c\x12\x18\x24\x30\x48\x60\x6c")))
+               goto fail;
        nla_nest_end(msg, band);
 
        nla_nest_end(msg, bands);
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: Set TX rates failed: ret=%d "
                           "(%s)", ret, strerror(-ret));
@@ -7130,7 +6737,7 @@ static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
 
        return ret;
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return -1;
 }
@@ -7189,56 +6796,13 @@ static int wpa_driver_nl80211_deinit_p2p_cli(void *priv)
 static void wpa_driver_nl80211_resume(void *priv)
 {
        struct i802_bss *bss = priv;
+       enum nl80211_iftype nlmode = nl80211_get_ifmode(bss);
 
        if (i802_set_iface_flags(bss, 1))
                wpa_printf(MSG_DEBUG, "nl80211: Failed to set interface up on resume event");
-}
-
-
-static int nl80211_send_ft_action(void *priv, u8 action, const u8 *target_ap,
-                                 const u8 *ies, size_t ies_len)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       int ret;
-       u8 *data, *pos;
-       size_t data_len;
-       const u8 *own_addr = bss->addr;
-
-       if (action != 1) {
-               wpa_printf(MSG_ERROR, "nl80211: Unsupported send_ft_action "
-                          "action %d", action);
-               return -1;
-       }
-
-       /*
-        * Action frame payload:
-        * Category[1] = 6 (Fast BSS Transition)
-        * Action[1] = 1 (Fast BSS Transition Request)
-        * STA Address
-        * Target AP Address
-        * FT IEs
-        */
-
-       data_len = 2 + 2 * ETH_ALEN + ies_len;
-       data = os_malloc(data_len);
-       if (data == NULL)
-               return -1;
-       pos = data;
-       *pos++ = 0x06; /* FT Action category */
-       *pos++ = action;
-       os_memcpy(pos, own_addr, ETH_ALEN);
-       pos += ETH_ALEN;
-       os_memcpy(pos, target_ap, ETH_ALEN);
-       pos += ETH_ALEN;
-       os_memcpy(pos, ies, ies_len);
-
-       ret = wpa_driver_nl80211_send_action(bss, drv->assoc_freq, 0,
-                                            drv->bssid, own_addr, drv->bssid,
-                                            data, data_len, 0);
-       os_free(data);
 
-       return ret;
+       if (is_p2p_net_interface(nlmode))
+               nl80211_disable_11b_rates(bss->drv, bss->drv->ifindex, 1);
 }
 
 
@@ -7248,33 +6812,20 @@ static int nl80211_signal_monitor(void *priv, int threshold, int hysteresis)
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nlattr *cqm;
-       int ret = -1;
 
        wpa_printf(MSG_DEBUG, "nl80211: Signal monitor threshold=%d "
                   "hysteresis=%d", threshold, hysteresis);
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_CQM)) ||
+           !(cqm = nla_nest_start(msg, NL80211_ATTR_CQM)) ||
+           nla_put_u32(msg, NL80211_ATTR_CQM_RSSI_THOLD, threshold) ||
+           nla_put_u32(msg, NL80211_ATTR_CQM_RSSI_HYST, hysteresis)) {
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_CQM);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-
-       cqm = nla_nest_start(msg, NL80211_ATTR_CQM);
-       if (cqm == NULL)
-               goto nla_put_failure;
-
-       NLA_PUT_U32(msg, NL80211_ATTR_CQM_RSSI_THOLD, threshold);
-       NLA_PUT_U32(msg, NL80211_ATTR_CQM_RSSI_HYST, hysteresis);
+       }
        nla_nest_end(msg, cqm);
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
 }
 
 
@@ -7311,18 +6862,8 @@ static int nl80211_get_channel_width(struct wpa_driver_nl80211_data *drv,
 {
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_INTERFACE);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_INTERFACE);
        return send_and_recv_msgs(drv, msg, get_channel_width, sig);
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -7334,8 +6875,12 @@ static int nl80211_signal_poll(void *priv, struct wpa_signal_info *si)
 
        os_memset(si, 0, sizeof(*si));
        res = nl80211_get_link_signal(drv, si);
-       if (res != 0)
-               return res;
+       if (res) {
+               if (drv->nlmode != NL80211_IFTYPE_ADHOC &&
+                   drv->nlmode != NL80211_IFTYPE_MESH_POINT)
+                       return res;
+               si->current_signal = 0;
+       }
 
        res = nl80211_get_channel_width(drv, si);
        if (res != 0)
@@ -7345,61 +6890,20 @@ static int nl80211_signal_poll(void *priv, struct wpa_signal_info *si)
 }
 
 
-static int wpa_driver_nl80211_shared_freq(void *priv)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       struct wpa_driver_nl80211_data *driver;
-       int freq = 0;
-
-       /*
-        * If the same PHY is in connected state with some other interface,
-        * then retrieve the assoc freq.
-        */
-       wpa_printf(MSG_DEBUG, "nl80211: Get shared freq for PHY %s",
-                  drv->phyname);
-
-       dl_list_for_each(driver, &drv->global->interfaces,
-                        struct wpa_driver_nl80211_data, list) {
-               if (drv == driver ||
-                   os_strcmp(drv->phyname, driver->phyname) != 0 ||
-                   !driver->associated)
-                       continue;
-
-               wpa_printf(MSG_DEBUG, "nl80211: Found a match for PHY %s - %s "
-                          MACSTR,
-                          driver->phyname, driver->first_bss->ifname,
-                          MAC2STR(driver->first_bss->addr));
-               if (is_ap_interface(driver->nlmode))
-                       freq = driver->first_bss->freq;
-               else
-                       freq = nl80211_get_assoc_freq(driver);
-               wpa_printf(MSG_DEBUG, "nl80211: Shared freq for PHY %s: %d",
-                          drv->phyname, freq);
-       }
-
-       if (!freq)
-               wpa_printf(MSG_DEBUG, "nl80211: No shared interface for "
-                          "PHY (%s) in associated state", drv->phyname);
-
-       return freq;
-}
-
-
 static int nl80211_send_frame(void *priv, const u8 *data, size_t data_len,
                              int encrypt)
 {
        struct i802_bss *bss = priv;
        return wpa_driver_nl80211_send_frame(bss, data, data_len, encrypt, 0,
-                                            0, 0, 0, 0);
+                                            0, 0, 0, 0, NULL, 0);
 }
 
 
 static int nl80211_set_param(void *priv, const char *param)
 {
-       wpa_printf(MSG_DEBUG, "nl80211: driver param='%s'", param);
        if (param == NULL)
                return 0;
+       wpa_printf(MSG_DEBUG, "nl80211: driver param='%s'", param);
 
 #ifdef CONFIG_P2P
        if (os_strstr(param, "use_p2p_group_interface=1")) {
@@ -7437,7 +6941,7 @@ static int nl80211_set_param(void *priv, const char *param)
 }
 
 
-static void * nl80211_global_init(void)
+static void * nl80211_global_init(void *ctx)
 {
        struct nl80211_global *global;
        struct netlink_config *cfg;
@@ -7445,6 +6949,7 @@ static void * nl80211_global_init(void)
        global = os_zalloc(sizeof(*global));
        if (global == NULL)
                return NULL;
+       global->ctx = ctx;
        global->ioctl_sock = -1;
        dl_list_init(&global->interfaces);
        global->if_add_ifindex = -1;
@@ -7521,22 +7026,14 @@ static int nl80211_pmkid(struct i802_bss *bss, int cmd, const u8 *bssid,
 {
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(bss->drv, msg, 0, cmd);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
-       if (pmkid)
-               NLA_PUT(msg, NL80211_ATTR_PMKID, 16, pmkid);
-       if (bssid)
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid);
+       if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
+           (pmkid && nla_put(msg, NL80211_ATTR_PMKID, 16, pmkid)) ||
+           (bssid && nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid))) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        return send_and_recv_msgs(bss->drv, msg, NULL, NULL);
- nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -7707,7 +7204,7 @@ static int wpa_driver_nl80211_get_survey(void *priv, unsigned int freq)
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int err = -ENOBUFS;
+       int err;
        union wpa_event_data data;
        struct survey_results *survey_results;
 
@@ -7716,13 +7213,9 @@ static int wpa_driver_nl80211_get_survey(void *priv, unsigned int freq)
 
        dl_list_init(&survey_results->survey_list);
 
-       msg = nlmsg_alloc();
+       msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
        if (!msg)
-               goto nla_put_failure;
-
-       nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_SURVEY);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+               return -ENOBUFS;
 
        if (freq)
                data.survey_results.freq_filter = freq;
@@ -7733,51 +7226,49 @@ static int wpa_driver_nl80211_get_survey(void *priv, unsigned int freq)
                                         survey_results);
        } while (err > 0);
 
-       if (err) {
+       if (err)
                wpa_printf(MSG_ERROR, "nl80211: Failed to process survey data");
-               goto out_clean;
-       }
-
-       wpa_supplicant_event(drv->ctx, EVENT_SURVEY, &data);
+       else
+               wpa_supplicant_event(drv->ctx, EVENT_SURVEY, &data);
 
-out_clean:
        clean_survey_results(survey_results);
-nla_put_failure:
        return err;
 }
 
 
-static void nl80211_set_rekey_info(void *priv, const u8 *kek, const u8 *kck,
+static void nl80211_set_rekey_info(void *priv, const u8 *kek, size_t kek_len,
+                                  const u8 *kck, size_t kck_len,
                                   const u8 *replay_ctr)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nlattr *replay_nested;
        struct nl_msg *msg;
+       int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!drv->set_rekey_offload)
                return;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_REKEY_OFFLOAD);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-
-       replay_nested = nla_nest_start(msg, NL80211_ATTR_REKEY_DATA);
-       if (!replay_nested)
-               goto nla_put_failure;
-
-       NLA_PUT(msg, NL80211_REKEY_DATA_KEK, NL80211_KEK_LEN, kek);
-       NLA_PUT(msg, NL80211_REKEY_DATA_KCK, NL80211_KCK_LEN, kck);
-       NLA_PUT(msg, NL80211_REKEY_DATA_REPLAY_CTR, NL80211_REPLAY_CTR_LEN,
-               replay_ctr);
+       wpa_printf(MSG_DEBUG, "nl80211: Set rekey offload");
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_REKEY_OFFLOAD)) ||
+           !(replay_nested = nla_nest_start(msg, NL80211_ATTR_REKEY_DATA)) ||
+           nla_put(msg, NL80211_REKEY_DATA_KEK, kek_len, kek) ||
+           nla_put(msg, NL80211_REKEY_DATA_KCK, kck_len, kck) ||
+           nla_put(msg, NL80211_REKEY_DATA_REPLAY_CTR, NL80211_REPLAY_CTR_LEN,
+                   replay_ctr)) {
+               nl80211_nlmsg_clear(msg);
+               nlmsg_free(msg);
+               return;
+       }
 
        nla_nest_end(msg, replay_nested);
 
-       send_and_recv_msgs(drv, msg, NULL, NULL);
-       return;
- nla_put_failure:
-       nlmsg_free(msg);
+       ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1);
+       if (ret == -EOPNOTSUPP) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Driver does not support rekey offload");
+               drv->set_rekey_offload = 0;
+       }
 }
 
 
@@ -7814,7 +7305,7 @@ static void nl80211_send_null_frame(struct i802_bss *bss, const u8 *own_addr,
        os_memcpy(nulldata.hdr.IEEE80211_SA_FROMDS, own_addr, ETH_ALEN);
 
        if (wpa_driver_nl80211_send_mlme(bss, (u8 *) &nulldata, size, 0, 0, 0,
-                                        0, 0) < 0)
+                                        0, 0, NULL, 0) < 0)
                wpa_printf(MSG_DEBUG, "nl80211_send_null_frame: Failed to "
                           "send poll frame");
 }
@@ -7825,25 +7316,25 @@ 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;
+       int ret;
 
        if (!drv->poll_command_supported) {
                nl80211_send_null_frame(bss, own_addr, addr, qos);
                return;
        }
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_PROBE_CLIENT)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) {
+               nlmsg_free(msg);
                return;
+       }
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_PROBE_CLIENT);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-
-       send_and_recv_msgs(drv, msg, NULL, NULL);
-       return;
- nla_put_failure:
-       nlmsg_free(msg);
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret < 0) {
+               wpa_printf(MSG_DEBUG, "nl80211: Client probe request for "
+                          MACSTR " failed: ret=%d (%s)",
+                          MAC2STR(addr), ret, strerror(-ret));
+       }
 }
 
 
@@ -7851,18 +7342,13 @@ static int nl80211_set_power_save(struct i802_bss *bss, int enabled)
 {
        struct nl_msg *msg;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(bss->drv, msg, 0, NL80211_CMD_SET_POWER_SAVE);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_PS_STATE,
-                   enabled ? NL80211_PS_ENABLED : NL80211_PS_DISABLED);
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_SET_POWER_SAVE)) ||
+           nla_put_u32(msg, NL80211_ATTR_PS_STATE,
+                       enabled ? NL80211_PS_ENABLED : NL80211_PS_DISABLED)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
        return send_and_recv_msgs(bss->drv, msg, NULL, NULL);
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -7909,24 +7395,17 @@ static int nl80211_start_radar_detection(void *priv,
                return -1;
        }
 
-       msg = nlmsg_alloc();
-       if (!msg)
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_RADAR_DETECT)) ||
+           nl80211_put_freq_params(msg, freq) < 0) {
+               nlmsg_free(msg);
                return -1;
-
-       nl80211_cmd(bss->drv, msg, 0, NL80211_CMD_RADAR_DETECT);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       if (nl80211_put_freq_params(msg, freq) < 0)
-               goto nla_put_failure;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret == 0)
                return 0;
        wpa_printf(MSG_DEBUG, "nl80211: Failed to start radar detection: "
                   "%d (%s)", ret, strerror(-ret));
-nla_put_failure:
-       nlmsg_free(msg);
        return -1;
 }
 
@@ -7947,16 +7426,12 @@ static int nl80211_send_tdls_mgmt(void *priv, const u8 *dst, u8 action_code,
        if (!dst)
                return -EINVAL;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_TDLS_MGMT);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
-       NLA_PUT_U8(msg, NL80211_ATTR_TDLS_ACTION, action_code);
-       NLA_PUT_U8(msg, NL80211_ATTR_TDLS_DIALOG_TOKEN, dialog_token);
-       NLA_PUT_U16(msg, NL80211_ATTR_STATUS_CODE, status_code);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_TDLS_MGMT)) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, dst) ||
+           nla_put_u8(msg, NL80211_ATTR_TDLS_ACTION, action_code) ||
+           nla_put_u8(msg, NL80211_ATTR_TDLS_DIALOG_TOKEN, dialog_token) ||
+           nla_put_u16(msg, NL80211_ATTR_STATUS_CODE, status_code))
+               goto fail;
        if (peer_capab) {
                /*
                 * The internal enum tdls_peer_capability definition is
@@ -7964,15 +7439,18 @@ static int nl80211_send_tdls_mgmt(void *priv, const u8 *dst, u8 action_code,
                 * nl80211_tdls_peer_capability, so no conversion is needed
                 * here.
                 */
-               NLA_PUT_U32(msg, NL80211_ATTR_TDLS_PEER_CAPABILITY, peer_capab);
+               if (nla_put_u32(msg, NL80211_ATTR_TDLS_PEER_CAPABILITY,
+                               peer_capab))
+                       goto fail;
        }
-       if (initiator)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_TDLS_INITIATOR);
-       NLA_PUT(msg, NL80211_ATTR_IE, len, buf);
+       if ((initiator &&
+            nla_put_flag(msg, NL80211_ATTR_TDLS_INITIATOR)) ||
+           nla_put(msg, NL80211_ATTR_IE, len, buf))
+               goto fail;
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return -ENOBUFS;
 }
@@ -8012,20 +7490,70 @@ static int nl80211_tdls_oper(void *priv, enum tdls_oper oper, const u8 *peer)
                return -EINVAL;
        }
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_TDLS_OPER)) ||
+           nla_put_u8(msg, NL80211_ATTR_TDLS_OPERATION, nl80211_oper) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
+
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
+}
+
+
+static int
+nl80211_tdls_enable_channel_switch(void *priv, const u8 *addr, u8 oper_class,
+                                  const struct hostapd_freq_params *params)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       int ret = -ENOBUFS;
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_TDLS_OPER);
-       NLA_PUT_U8(msg, NL80211_ATTR_TDLS_OPERATION, nl80211_oper);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, peer);
+       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT) ||
+           !(drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_CHANNEL_SWITCH))
+               return -EOPNOTSUPP;
+
+       wpa_printf(MSG_DEBUG, "nl80211: Enable TDLS channel switch " MACSTR
+                  " oper_class=%u freq=%u",
+                  MAC2STR(addr), oper_class, params->freq);
+       msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_TDLS_CHANNEL_SWITCH);
+       if (!msg ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           nla_put_u8(msg, NL80211_ATTR_OPER_CLASS, oper_class) ||
+           (ret = nl80211_put_freq_params(msg, params))) {
+               nlmsg_free(msg);
+               wpa_printf(MSG_DEBUG, "nl80211: Could not build TDLS chan switch");
+               return ret;
+       }
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
+}
 
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
+
+static int
+nl80211_tdls_disable_channel_switch(void *priv, const u8 *addr)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+
+       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT) ||
+           !(drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_CHANNEL_SWITCH))
+               return -EOPNOTSUPP;
+
+       wpa_printf(MSG_DEBUG, "nl80211: Disable TDLS channel switch " MACSTR,
+                  MAC2STR(addr));
+       msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH);
+       if (!msg ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) {
+               nlmsg_free(msg);
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Could not build TDLS cancel chan switch");
+               return -ENOBUFS;
+       }
+
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
 }
 
 #endif /* CONFIG TDLS */
@@ -8047,6 +7575,19 @@ static int driver_nl80211_scan2(void *priv,
                                struct wpa_driver_scan_params *params)
 {
        struct i802_bss *bss = priv;
+#ifdef CONFIG_DRIVER_NL80211_QCA
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       /*
+        * Do a vendor specific scan if possible. If only_new_results is
+        * set, do a normal scan since a kernel (cfg80211) BSS cache flush
+        * cannot be achieved through a vendor scan. The below condition may
+        * need to be modified if new scan flags are added in the future whose
+        * functionality can only be achieved through a normal scan.
+        */
+       if (drv->scan_vendor_cmd_avail && !params->only_new_results)
+               return wpa_driver_nl80211_vendor_scan(bss, params);
+#endif /* CONFIG_DRIVER_NL80211_QCA */
        return wpa_driver_nl80211_scan(bss, params);
 }
 
@@ -8083,11 +7624,14 @@ static int driver_nl80211_if_remove(void *priv, enum wpa_driver_if_type type,
 
 
 static int driver_nl80211_send_mlme(void *priv, const u8 *data,
-                                   size_t data_len, int noack)
+                                   size_t data_len, int noack,
+                                   unsigned int freq,
+                                   const u16 *csa_offs, size_t csa_offs_len)
 {
        struct i802_bss *bss = priv;
        return wpa_driver_nl80211_send_mlme(bss, data, data_len, noack,
-                                           0, 0, 0, 0);
+                                           freq, 0, 0, 0, csa_offs,
+                                           csa_offs_len);
 }
 
 
@@ -8144,15 +7688,13 @@ static int wpa_driver_nl80211_update_ft_ies(void *priv, const u8 *md,
        struct wpa_driver_nl80211_data *drv = bss->drv;
        u16 mdid = WPA_GET_LE16(md);
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_printf(MSG_DEBUG, "nl80211: Updating FT IEs");
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_UPDATE_FT_IES);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_IE, ies_len, ies);
-       NLA_PUT_U16(msg, NL80211_ATTR_MDID, mdid);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_UPDATE_FT_IES)) ||
+           nla_put(msg, NL80211_ATTR_IE, ies_len, ies) ||
+           nla_put_u16(msg, NL80211_ATTR_MDID, mdid)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret) {
@@ -8161,14 +7703,10 @@ static int wpa_driver_nl80211_update_ft_ies(void *priv, const u8 *md,
        }
 
        return ret;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
-const u8 * wpa_driver_nl80211_get_macaddr(void *priv)
+static const u8 * wpa_driver_nl80211_get_macaddr(void *priv)
 {
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
@@ -8233,14 +7771,14 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                          bss->added_bridge ? "added_bridge=1\n" : "",
                          bss->in_deinit ? "in_deinit=1\n" : "",
                          bss->if_dynamic ? "if_dynamic=1\n" : "");
-       if (res < 0 || res >= end - pos)
+       if (os_snprintf_error(end - pos, res))
                return pos - buf;
        pos += res;
 
        if (bss->wdev_id_set) {
                res = os_snprintf(pos, end - pos, "wdev_id=%llu\n",
                                  (unsigned long long) bss->wdev_id);
-               if (res < 0 || res >= end - pos)
+               if (os_snprintf_error(end - pos, res))
                        return pos - buf;
                pos += res;
        }
@@ -8299,7 +7837,7 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                          "ignore_next_local_disconnect=1\n" : "",
                          drv->ignore_next_local_deauth ?
                          "ignore_next_local_deauth=1\n" : "");
-       if (res < 0 || res >= end - pos)
+       if (os_snprintf_error(end - pos, res))
                return pos - buf;
        pos += res;
 
@@ -8309,6 +7847,7 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                                  "capa.enc=0x%x\n"
                                  "capa.auth=0x%x\n"
                                  "capa.flags=0x%llx\n"
+                                 "capa.rrm_flags=0x%x\n"
                                  "capa.max_scan_ssids=%d\n"
                                  "capa.max_sched_scan_ssids=%d\n"
                                  "capa.sched_scan_supported=%d\n"
@@ -8317,11 +7856,20 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                                  "capa.max_stations=%u\n"
                                  "capa.probe_resp_offloads=0x%x\n"
                                  "capa.max_acl_mac_addrs=%u\n"
-                                 "capa.num_multichan_concurrent=%u\n",
+                                 "capa.num_multichan_concurrent=%u\n"
+                                 "capa.mac_addr_rand_sched_scan_supported=%d\n"
+                                 "capa.mac_addr_rand_scan_supported=%d\n"
+                                 "capa.conc_capab=%u\n"
+                                 "capa.max_conc_chan_2_4=%u\n"
+                                 "capa.max_conc_chan_5_0=%u\n"
+                                 "capa.max_sched_scan_plans=%u\n"
+                                 "capa.max_sched_scan_plan_interval=%u\n"
+                                 "capa.max_sched_scan_plan_iterations=%u\n",
                                  drv->capa.key_mgmt,
                                  drv->capa.enc,
                                  drv->capa.auth,
                                  (unsigned long long) drv->capa.flags,
+                                 drv->capa.rrm_flags,
                                  drv->capa.max_scan_ssids,
                                  drv->capa.max_sched_scan_ssids,
                                  drv->capa.sched_scan_supported,
@@ -8330,8 +7878,16 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
                                  drv->capa.max_stations,
                                  drv->capa.probe_resp_offloads,
                                  drv->capa.max_acl_mac_addrs,
-                                 drv->capa.num_multichan_concurrent);
-               if (res < 0 || res >= end - pos)
+                                 drv->capa.num_multichan_concurrent,
+                                 drv->capa.mac_addr_rand_sched_scan_supported,
+                                 drv->capa.mac_addr_rand_scan_supported,
+                                 drv->capa.conc_capab,
+                                 drv->capa.max_conc_chan_2_4,
+                                 drv->capa.max_conc_chan_5_0,
+                                 drv->capa.max_sched_scan_plans,
+                                 drv->capa.max_sched_scan_plan_interval,
+                                 drv->capa.max_sched_scan_plan_iterations);
+               if (os_snprintf_error(end - pos, res))
                        return pos - buf;
                pos += res;
        }
@@ -8342,35 +7898,27 @@ static int wpa_driver_nl80211_status(void *priv, char *buf, size_t buflen)
 
 static int set_beacon_data(struct nl_msg *msg, struct beacon_data *settings)
 {
-       if (settings->head)
-               NLA_PUT(msg, NL80211_ATTR_BEACON_HEAD,
-                       settings->head_len, settings->head);
-
-       if (settings->tail)
-               NLA_PUT(msg, NL80211_ATTR_BEACON_TAIL,
-                       settings->tail_len, settings->tail);
-
-       if (settings->beacon_ies)
-               NLA_PUT(msg, NL80211_ATTR_IE,
-                       settings->beacon_ies_len, settings->beacon_ies);
-
-       if (settings->proberesp_ies)
-               NLA_PUT(msg, NL80211_ATTR_IE_PROBE_RESP,
-                       settings->proberesp_ies_len, settings->proberesp_ies);
-
-       if (settings->assocresp_ies)
-               NLA_PUT(msg,
-                       NL80211_ATTR_IE_ASSOC_RESP,
-                       settings->assocresp_ies_len, settings->assocresp_ies);
-
-       if (settings->probe_resp)
-               NLA_PUT(msg, NL80211_ATTR_PROBE_RESP,
-                       settings->probe_resp_len, settings->probe_resp);
+       if ((settings->head &&
+            nla_put(msg, NL80211_ATTR_BEACON_HEAD,
+                    settings->head_len, settings->head)) ||
+           (settings->tail &&
+            nla_put(msg, NL80211_ATTR_BEACON_TAIL,
+                    settings->tail_len, settings->tail)) ||
+           (settings->beacon_ies &&
+            nla_put(msg, NL80211_ATTR_IE,
+                    settings->beacon_ies_len, settings->beacon_ies)) ||
+           (settings->proberesp_ies &&
+            nla_put(msg, NL80211_ATTR_IE_PROBE_RESP,
+                    settings->proberesp_ies_len, settings->proberesp_ies)) ||
+           (settings->assocresp_ies &&
+            nla_put(msg, NL80211_ATTR_IE_ASSOC_RESP,
+                    settings->assocresp_ies_len, settings->assocresp_ies)) ||
+           (settings->probe_resp &&
+            nla_put(msg, NL80211_ATTR_PROBE_RESP,
+                    settings->probe_resp_len, settings->probe_resp)))
+               return -ENOBUFS;
 
        return 0;
-
-nla_put_failure:
-       return -ENOBUFS;
 }
 
 
@@ -8381,6 +7929,8 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nlattr *beacon_csa;
        int ret = -ENOBUFS;
+       int csa_off_len = 0;
+       int i;
 
        wpa_printf(MSG_DEBUG, "nl80211: Channel switch request (cs_count=%u block_tx=%u freq=%d width=%d cf1=%d cf2=%d)",
                   settings->cs_count, settings->block_tx,
@@ -8397,34 +7947,64 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
            (drv->nlmode != NL80211_IFTYPE_P2P_GO))
                return -EOPNOTSUPP;
 
-       /* check settings validity */
-       if (!settings->beacon_csa.tail ||
-           ((settings->beacon_csa.tail_len <=
-             settings->counter_offset_beacon) ||
-            (settings->beacon_csa.tail[settings->counter_offset_beacon] !=
-             settings->cs_count)))
+       /*
+        * Remove empty counters, assuming Probe Response and Beacon frame
+        * counters match. This implementation assumes that there are only two
+        * counters.
+        */
+       if (settings->counter_offset_beacon[0] &&
+           !settings->counter_offset_beacon[1]) {
+               csa_off_len = 1;
+       } else if (settings->counter_offset_beacon[1] &&
+                  !settings->counter_offset_beacon[0]) {
+               csa_off_len = 1;
+               settings->counter_offset_beacon[0] =
+                       settings->counter_offset_beacon[1];
+               settings->counter_offset_presp[0] =
+                       settings->counter_offset_presp[1];
+       } else if (settings->counter_offset_beacon[1] &&
+                  settings->counter_offset_beacon[0]) {
+               csa_off_len = 2;
+       } else {
+               wpa_printf(MSG_ERROR, "nl80211: No CSA counters provided");
+               return -EINVAL;
+       }
+
+       /* Check CSA counters validity */
+       if (drv->capa.max_csa_counters &&
+           csa_off_len > drv->capa.max_csa_counters) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: Too many CSA counters provided");
                return -EINVAL;
+       }
 
-       if (settings->beacon_csa.probe_resp &&
-           ((settings->beacon_csa.probe_resp_len <=
-             settings->counter_offset_presp) ||
-            (settings->beacon_csa.probe_resp[settings->counter_offset_presp] !=
-             settings->cs_count)))
+       if (!settings->beacon_csa.tail)
                return -EINVAL;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
+       for (i = 0; i < csa_off_len; i++) {
+               u16 csa_c_off_bcn = settings->counter_offset_beacon[i];
+               u16 csa_c_off_presp = settings->counter_offset_presp[i];
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_CHANNEL_SWITCH);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_CH_SWITCH_COUNT, settings->cs_count);
-       ret = nl80211_put_freq_params(msg, &settings->freq_params);
-       if (ret)
-               goto error;
+               if ((settings->beacon_csa.tail_len <= csa_c_off_bcn) ||
+                   (settings->beacon_csa.tail[csa_c_off_bcn] !=
+                    settings->cs_count))
+                       return -EINVAL;
 
-       if (settings->block_tx)
-               NLA_PUT_FLAG(msg, NL80211_ATTR_CH_SWITCH_BLOCK_TX);
+               if (settings->beacon_csa.probe_resp &&
+                   ((settings->beacon_csa.probe_resp_len <=
+                     csa_c_off_presp) ||
+                    (settings->beacon_csa.probe_resp[csa_c_off_presp] !=
+                     settings->cs_count)))
+                       return -EINVAL;
+       }
+
+       if (!(msg = nl80211_bss_msg(bss, 0, NL80211_CMD_CHANNEL_SWITCH)) ||
+           nla_put_u32(msg, NL80211_ATTR_CH_SWITCH_COUNT,
+                       settings->cs_count) ||
+           (ret = nl80211_put_freq_params(msg, &settings->freq_params)) ||
+           (settings->block_tx &&
+            nla_put_flag(msg, NL80211_ATTR_CH_SWITCH_BLOCK_TX)))
+               goto error;
 
        /* beacon_after params */
        ret = set_beacon_data(msg, &settings->beacon_after);
@@ -8434,18 +8014,20 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
        /* beacon_csa params */
        beacon_csa = nla_nest_start(msg, NL80211_ATTR_CSA_IES);
        if (!beacon_csa)
-               goto nla_put_failure;
+               goto fail;
 
        ret = set_beacon_data(msg, &settings->beacon_csa);
        if (ret)
                goto error;
 
-       NLA_PUT_U16(msg, NL80211_ATTR_CSA_C_OFF_BEACON,
-                   settings->counter_offset_beacon);
-
-       if (settings->beacon_csa.probe_resp)
-               NLA_PUT_U16(msg, NL80211_ATTR_CSA_C_OFF_PRESP,
-                           settings->counter_offset_presp);
+       if (nla_put(msg, NL80211_ATTR_CSA_C_OFF_BEACON,
+                   csa_off_len * sizeof(u16),
+                   settings->counter_offset_beacon) ||
+           (settings->beacon_csa.probe_resp &&
+            nla_put(msg, NL80211_ATTR_CSA_C_OFF_PRESP,
+                    csa_off_len * sizeof(u16),
+                    settings->counter_offset_presp)))
+               goto fail;
 
        nla_nest_end(msg, beacon_csa);
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
@@ -8455,7 +8037,7 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
        }
        return ret;
 
-nla_put_failure:
+fail:
        ret = -ENOBUFS;
 error:
        nlmsg_free(msg);
@@ -8479,28 +8061,21 @@ static int nl80211_add_ts(void *priv, u8 tsid, const u8 *addr,
        if (!is_sta_interface(drv->nlmode))
                return -ENOTSUP;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_ADD_TX_TS);
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-
-       NLA_PUT_U8(msg, NL80211_ATTR_TSID, tsid);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U8(msg, NL80211_ATTR_USER_PRIO, user_priority);
-       NLA_PUT_U16(msg, NL80211_ATTR_ADMITTED_TIME, admitted_time);
+       msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_ADD_TX_TS);
+       if (!msg ||
+           nla_put_u8(msg, NL80211_ATTR_TSID, tsid) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
+           nla_put_u8(msg, NL80211_ATTR_USER_PRIO, user_priority) ||
+           nla_put_u16(msg, NL80211_ATTR_ADMITTED_TIME, admitted_time)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: add_ts failed err=%d (%s)",
                           ret, strerror(-ret));
        return ret;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -8516,26 +8091,18 @@ static int nl80211_del_ts(void *priv, u8 tsid, const u8 *addr)
        if (!is_sta_interface(drv->nlmode))
                return -ENOTSUP;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_TX_TS);
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-
-       NLA_PUT_U8(msg, NL80211_ATTR_TSID, tsid);
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_DEL_TX_TS)) ||
+           nla_put_u8(msg, NL80211_ATTR_TSID, tsid) ||
+           nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: del_ts failed err=%d (%s)",
                           ret, strerror(-ret));
        return ret;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -8601,16 +8168,16 @@ static int nl80211_vendor_cmd(void *priv, unsigned int vendor_id,
        struct nl_msg *msg;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
 #ifdef CONFIG_TESTING_OPTIONS
        if (vendor_id == 0xffffffff) {
+               msg = nlmsg_alloc();
+               if (!msg)
+                       return -ENOMEM;
+
                nl80211_cmd(drv, msg, 0, subcmd);
                if (nlmsg_append(msg, (void *) data, data_len, NLMSG_ALIGNTO) <
                    0)
-                       goto nla_put_failure;
+                       goto fail;
                ret = send_and_recv_msgs(drv, msg, cmd_reply_handler, buf);
                if (ret)
                        wpa_printf(MSG_DEBUG, "nl80211: command failed err=%d",
@@ -8619,13 +8186,12 @@ static int nl80211_vendor_cmd(void *priv, unsigned int vendor_id,
        }
 #endif /* CONFIG_TESTING_OPTIONS */
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR);
-       if (nl80211_set_iface_id(msg, bss) < 0)
-               goto nla_put_failure;
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_ID, vendor_id);
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_SUBCMD, subcmd);
-       if (data)
-               NLA_PUT(msg, NL80211_ATTR_VENDOR_DATA, data_len, data);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, vendor_id) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, subcmd) ||
+           (data &&
+            nla_put(msg, NL80211_ATTR_VENDOR_DATA, data_len, data)))
+               goto fail;
 
        ret = send_and_recv_msgs(drv, msg, vendor_reply_handler, buf);
        if (ret)
@@ -8633,7 +8199,7 @@ static int nl80211_vendor_cmd(void *priv, unsigned int vendor_id,
                           ret);
        return ret;
 
-nla_put_failure:
+fail:
        nlmsg_free(msg);
        return -ENOBUFS;
 }
@@ -8647,26 +8213,20 @@ static int nl80211_set_qos_map(void *priv, const u8 *qos_map_set,
        struct nl_msg *msg;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_hexdump(MSG_DEBUG, "nl80211: Setting QoS Map",
                    qos_map_set, qos_map_set_len);
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_QOS_MAP);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT(msg, NL80211_ATTR_QOS_MAP, qos_map_set_len, qos_map_set);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_SET_QOS_MAP)) ||
+           nla_put(msg, NL80211_ATTR_QOS_MAP, qos_map_set_len, qos_map_set)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
        if (ret)
                wpa_printf(MSG_DEBUG, "nl80211: Setting QoS Map failed");
 
        return ret;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
@@ -8679,33 +8239,28 @@ static int nl80211_set_wowlan(void *priv,
        struct nlattr *wowlan_triggers;
        int ret;
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
        wpa_printf(MSG_DEBUG, "nl80211: Setting wowlan");
 
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WOWLAN);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
-       wowlan_triggers = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS);
-       if (!wowlan_triggers)
-               goto nla_put_failure;
-
-       if (triggers->any)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_ANY);
-       if (triggers->disconnect)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_DISCONNECT);
-       if (triggers->magic_pkt)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT);
-       if (triggers->gtk_rekey_failure)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE);
-       if (triggers->eap_identity_req)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST);
-       if (triggers->four_way_handshake)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE);
-       if (triggers->rfkill_release)
-               NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE);
+       if (!(msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_SET_WOWLAN)) ||
+           !(wowlan_triggers = nla_nest_start(msg,
+                                              NL80211_ATTR_WOWLAN_TRIGGERS)) ||
+           (triggers->any &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_ANY)) ||
+           (triggers->disconnect &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_DISCONNECT)) ||
+           (triggers->magic_pkt &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT)) ||
+           (triggers->gtk_rekey_failure &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE)) ||
+           (triggers->eap_identity_req &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST)) ||
+           (triggers->four_way_handshake &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE)) ||
+           (triggers->rfkill_release &&
+            nla_put_flag(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE))) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
 
        nla_nest_end(msg, wowlan_triggers);
 
@@ -8714,13 +8269,10 @@ static int nl80211_set_wowlan(void *priv,
                wpa_printf(MSG_DEBUG, "nl80211: Setting wowlan failed");
 
        return ret;
-
-nla_put_failure:
-       nlmsg_free(msg);
-       return -ENOBUFS;
 }
 
 
+#ifdef CONFIG_DRIVER_NL80211_QCA
 static int nl80211_roaming(void *priv, int allowed, const u8 *bssid)
 {
        struct i802_bss *bss = priv;
@@ -8736,33 +8288,24 @@ static int nl80211_roaming(void *priv, int allowed, const u8 *bssid)
                return -1;
        }
 
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -ENOMEM;
-
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA);
-       NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_SUBCMD,
-                   QCA_NL80211_VENDOR_SUBCMD_ROAMING);
-
-       params = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
-       if (!params)
-               goto nla_put_failure;
-       NLA_PUT_U32(msg, QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY,
-                   allowed ? QCA_ROAMING_ALLOWED_WITHIN_ESS :
-                   QCA_ROAMING_NOT_ALLOWED);
-       if (bssid)
-               NLA_PUT(msg, QCA_WLAN_VENDOR_ATTR_MAC_ADDR, ETH_ALEN, bssid);
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_ROAMING) ||
+           !(params = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u32(msg, QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY,
+                       allowed ? QCA_ROAMING_ALLOWED_WITHIN_ESS :
+                       QCA_ROAMING_NOT_ALLOWED) ||
+           (bssid &&
+            nla_put(msg, QCA_WLAN_VENDOR_ATTR_MAC_ADDR, ETH_ALEN, bssid))) {
+               nlmsg_free(msg);
+               return -1;
+       }
        nla_nest_end(msg, params);
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
-
- nla_put_failure:
-       nlmsg_free(msg);
-       return -1;
 }
+#endif /* CONFIG_DRIVER_NL80211_QCA */
 
 
 static int nl80211_set_mac_addr(void *priv, const u8 *addr)
@@ -8771,6 +8314,9 @@ static int nl80211_set_mac_addr(void *priv, const u8 *addr)
        struct wpa_driver_nl80211_data *drv = bss->drv;
        int new_addr = addr != NULL;
 
+       if (TEST_FAIL())
+               return -1;
+
        if (!addr)
                addr = drv->perm_addr;
 
@@ -8818,121 +8364,129 @@ static int wpa_driver_nl80211_init_mesh(void *priv)
 }
 
 
-static int
-wpa_driver_nl80211_join_mesh(void *priv,
+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);
+               return nla_put(msg, NL80211_ATTR_MESH_ID, mesh_id_len, mesh_id);
+       }
+
+       return 0;
+}
+
+
+static int nl80211_join_mesh(struct i802_bss *bss,
                             struct wpa_driver_mesh_join_params *params)
 {
-       struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nlattr *container;
-       int ret = 0;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
+       int ret = -1;
 
        wpa_printf(MSG_DEBUG, "nl80211: mesh join (ifindex=%d)", drv->ifindex);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_JOIN_MESH);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-       if (params->freq) {
-               wpa_printf(MSG_DEBUG, "  * freq=%d", params->freq);
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq);
-       }
-
-       if (params->ht_mode) {
-               unsigned int ht_value;
-               char *ht_mode = "";
-
-               switch (params->ht_mode) {
-               default:
-               case CHAN_NO_HT:
-                       ht_value = NL80211_CHAN_NO_HT;
-                       ht_mode = "NOHT";
-                       break;
-               case CHAN_HT20:
-                       ht_value = NL80211_CHAN_HT20;
-                       ht_mode = "HT20";
-                       break;
-               case CHAN_HT40PLUS:
-                       ht_value = NL80211_CHAN_HT40PLUS;
-                       ht_mode = "HT40+";
-                       break;
-               case CHAN_HT40MINUS:
-                       ht_value = NL80211_CHAN_HT40MINUS;
-                       ht_mode = "HT40-";
-                       break;
-               }
-               wpa_printf(MSG_DEBUG, "  * ht_mode=%s", ht_mode);
-               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, ht_value);
-       }
-
-       if (params->basic_rates) {
-               u8 rates[NL80211_MAX_SUPP_RATES];
-               u8 rates_len = 0;
-               int i;
-
-               for (i = 0; i < NL80211_MAX_SUPP_RATES; i++) {
-                       if (params->basic_rates[i] < 0)
-                               break;
-                       rates[rates_len++] = params->basic_rates[i] / 5;
-               }
-
-               NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, rates_len, rates);
-       }
-
-       if (params->meshid) {
-               wpa_hexdump_ascii(MSG_DEBUG, "  * SSID",
-                                 params->meshid, params->meshid_len);
-               NLA_PUT(msg, NL80211_ATTR_MESH_ID, params->meshid_len,
-                       params->meshid);
-       }
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_JOIN_MESH);
+       if (!msg ||
+           nl80211_put_freq_params(msg, &params->freq) ||
+           nl80211_put_basic_rates(msg, params->basic_rates) ||
+           nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
+           nl80211_put_beacon_int(msg, params->beacon_int))
+               goto fail;
 
        wpa_printf(MSG_DEBUG, "  * flags=%08X", params->flags);
 
        container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP);
        if (!container)
-               goto nla_put_failure;
+               goto fail;
 
        if (params->ies) {
                wpa_hexdump(MSG_DEBUG, "  * IEs", params->ies, params->ie_len);
-               NLA_PUT(msg, NL80211_MESH_SETUP_IE, params->ie_len,
-                       params->ies);
+               if (nla_put(msg, NL80211_MESH_SETUP_IE, params->ie_len,
+                           params->ies))
+                       goto fail;
        }
        /* WPA_DRIVER_MESH_FLAG_OPEN_AUTH is treated as default by nl80211 */
        if (params->flags & WPA_DRIVER_MESH_FLAG_SAE_AUTH) {
-               NLA_PUT_U8(msg, NL80211_MESH_SETUP_AUTH_PROTOCOL, 0x1);
-               NLA_PUT_FLAG(msg, NL80211_MESH_SETUP_USERSPACE_AUTH);
+               if (nla_put_u8(msg, NL80211_MESH_SETUP_AUTH_PROTOCOL, 0x1) ||
+                   nla_put_flag(msg, NL80211_MESH_SETUP_USERSPACE_AUTH))
+                       goto fail;
        }
-       if (params->flags & WPA_DRIVER_MESH_FLAG_AMPE)
-               NLA_PUT_FLAG(msg, NL80211_MESH_SETUP_USERSPACE_AMPE);
-       if (params->flags & WPA_DRIVER_MESH_FLAG_USER_MPM)
-               NLA_PUT_FLAG(msg, NL80211_MESH_SETUP_USERSPACE_MPM);
+       if ((params->flags & WPA_DRIVER_MESH_FLAG_AMPE) &&
+           nla_put_flag(msg, NL80211_MESH_SETUP_USERSPACE_AMPE))
+               goto fail;
+       if ((params->flags & WPA_DRIVER_MESH_FLAG_USER_MPM) &&
+           nla_put_flag(msg, NL80211_MESH_SETUP_USERSPACE_MPM))
+               goto fail;
        nla_nest_end(msg, container);
 
        container = nla_nest_start(msg, NL80211_ATTR_MESH_CONFIG);
        if (!container)
-               goto nla_put_failure;
+               goto fail;
+
+       if (!(params->conf.flags & WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS) &&
+           nla_put_u32(msg, NL80211_MESHCONF_AUTO_OPEN_PLINKS, 0))
+               goto fail;
+       if (nla_put_u16(msg, NL80211_MESHCONF_MAX_PEER_LINKS,
+                       params->max_peer_links))
+               goto fail;
+
+       /*
+        * Set NL80211_MESHCONF_PLINK_TIMEOUT even if user mpm is used because
+        * the timer could disconnect stations even in that case.
+        */
+       if (nla_put_u32(msg, NL80211_MESHCONF_PLINK_TIMEOUT,
+                       params->conf.peer_link_timeout)) {
+               wpa_printf(MSG_ERROR, "nl80211: Failed to set PLINK_TIMEOUT");
+               goto fail;
+       }
+
+       nla_nest_end(msg, container);
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       msg = NULL;
+       if (ret) {
+               wpa_printf(MSG_DEBUG, "nl80211: mesh join failed: ret=%d (%s)",
+                          ret, strerror(-ret));
+               goto fail;
+       }
+       ret = 0;
+       drv->assoc_freq = bss->freq = params->freq.freq;
+       wpa_printf(MSG_DEBUG, "nl80211: mesh join request send successfully");
+
+fail:
+       nlmsg_free(msg);
+       return ret;
+}
+
+
+static int
+wpa_driver_nl80211_join_mesh(void *priv,
+                            struct wpa_driver_mesh_join_params *params)
+{
+       struct i802_bss *bss = priv;
+       int ret, timeout;
+
+       timeout = params->conf.peer_link_timeout;
 
-       if (!(params->conf.flags & WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS))
-               NLA_PUT_U32(msg, NL80211_MESHCONF_AUTO_OPEN_PLINKS, 0);
-       nla_nest_end(msg, container);
+       /* Disable kernel inactivity timer */
+       if (params->flags & WPA_DRIVER_MESH_FLAG_USER_MPM)
+               params->conf.peer_link_timeout = 0;
 
-       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
-       if (ret) {
-               wpa_printf(MSG_DEBUG, "nl80211: mesh join failed: ret=%d (%s)",
-                          ret, strerror(-ret));
-               goto nla_put_failure;
+       ret = nl80211_join_mesh(bss, params);
+       if (ret == -EINVAL && params->conf.peer_link_timeout == 0) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Mesh join retry for peer_link_timeout");
+               /*
+                * Old kernel does not support setting
+                * NL80211_MESHCONF_PLINK_TIMEOUT to zero, so set 60 seconds
+                * into future from peer_link_timeout.
+                */
+               params->conf.peer_link_timeout = timeout + 60;
+               ret = nl80211_join_mesh(priv, params);
        }
-       ret = 0;
-       bss->freq = params->freq;
-       wpa_printf(MSG_DEBUG, "nl80211: mesh join request send successfully");
 
-
-nla_put_failure:
-       nlmsg_free(msg);
+       params->conf.peer_link_timeout = timeout;
        return ret;
 }
 
@@ -8942,28 +8496,24 @@ static int wpa_driver_nl80211_leave_mesh(void *priv)
        struct i802_bss *bss = priv;
        struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
-       int ret = 0;
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               return -1;
+       int ret;
 
        wpa_printf(MSG_DEBUG, "nl80211: mesh leave (ifindex=%d)", drv->ifindex);
-       nl80211_cmd(drv, msg, 0, NL80211_CMD_LEAVE_MESH);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
-
+       msg = nl80211_drv_msg(drv, 0, NL80211_CMD_LEAVE_MESH);
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
-       msg = NULL;
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: mesh leave failed: ret=%d (%s)",
                           ret, strerror(-ret));
-               goto nla_put_failure;
+       } else {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: mesh leave request send successfully");
        }
-       ret = 0;
-       wpa_printf(MSG_DEBUG, "nl80211: mesh leave request send successfully");
 
-nla_put_failure:
-       nlmsg_free(msg);
+       if (wpa_driver_nl80211_set_mode(drv->first_bss,
+                                       NL80211_IFTYPE_STATION)) {
+               wpa_printf(MSG_INFO,
+                          "nl80211: Failed to set interface into station mode");
+       }
        return ret;
 }
 
@@ -9139,7 +8689,7 @@ static int linux_write_system_file(const char *path, unsigned int val)
        int fd, len;
 
        len = os_snprintf(buf, sizeof(buf), "%u\n", val);
-       if (len < 0)
+       if (os_snprintf_error(sizeof(buf), len))
                return -1;
 
        fd = open(path, O_WRONLY);
@@ -9163,7 +8713,7 @@ static const char * drv_br_port_attr_str(enum drv_br_port_attr attr)
 {
        switch (attr) {
        case DRV_BR_PORT_ATTR_PROXYARP:
-               return "proxyarp";
+               return "proxyarp_wifi";
        case DRV_BR_PORT_ATTR_HAIRPIN_MODE:
                return "hairpin_mode";
        }
@@ -9198,9 +8748,9 @@ static const char * drv_br_net_param_str(enum drv_br_net_param param)
        switch (param) {
        case DRV_BR_NET_PARAM_GARP_ACCEPT:
                return "arp_accept";
+       default:
+               return NULL;
        }
-
-       return NULL;
 }
 
 
@@ -9212,6 +8762,13 @@ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
        const char *param_txt;
        int ip_version = 4;
 
+       if (param == DRV_BR_MULTICAST_SNOOPING) {
+               os_snprintf(path, sizeof(path),
+                           "/sys/devices/virtual/net/%s/bridge/multicast_snooping",
+                           bss->brname);
+               goto set_val;
+       }
+
        param_txt = drv_br_net_param_str(param);
        if (param_txt == NULL)
                return -EINVAL;
@@ -9227,6 +8784,7 @@ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
        os_snprintf(path, sizeof(path), "/proc/sys/net/ipv%d/conf/%s/%s",
                    ip_version, bss->brname, param_txt);
 
+set_val:
        if (linux_write_system_file(path, val))
                return -1;
 
@@ -9234,6 +8792,458 @@ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
 }
 
 
+#ifdef CONFIG_DRIVER_NL80211_QCA
+
+static int hw_mode_to_qca_acs(enum hostapd_hw_mode hw_mode)
+{
+       switch (hw_mode) {
+       case HOSTAPD_MODE_IEEE80211B:
+               return QCA_ACS_MODE_IEEE80211B;
+       case HOSTAPD_MODE_IEEE80211G:
+               return QCA_ACS_MODE_IEEE80211G;
+       case HOSTAPD_MODE_IEEE80211A:
+               return QCA_ACS_MODE_IEEE80211A;
+       case HOSTAPD_MODE_IEEE80211AD:
+               return QCA_ACS_MODE_IEEE80211AD;
+       case HOSTAPD_MODE_IEEE80211ANY:
+               return QCA_ACS_MODE_IEEE80211ANY;
+       default:
+               return -1;
+       }
+}
+
+
+static int add_acs_freq_list(struct nl_msg *msg, const int *freq_list)
+{
+       int i, len, ret;
+       u32 *freqs;
+
+       if (!freq_list)
+               return 0;
+       len = int_array_len(freq_list);
+       freqs = os_malloc(sizeof(u32) * len);
+       if (!freqs)
+               return -1;
+       for (i = 0; i < len; i++)
+               freqs[i] = freq_list[i];
+       ret = nla_put(msg, QCA_WLAN_VENDOR_ATTR_ACS_FREQ_LIST,
+                     sizeof(u32) * len, freqs);
+       os_free(freqs);
+       return ret;
+}
+
+
+static int wpa_driver_do_acs(void *priv, struct drv_acs_params *params)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       struct nlattr *data;
+       int ret;
+       int mode;
+
+       mode = hw_mode_to_qca_acs(params->hw_mode);
+       if (mode < 0)
+               return -1;
+
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_DO_ACS) ||
+           !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u8(msg, QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE, mode) ||
+           (params->ht_enabled &&
+            nla_put_flag(msg, QCA_WLAN_VENDOR_ATTR_ACS_HT_ENABLED)) ||
+           (params->ht40_enabled &&
+            nla_put_flag(msg, QCA_WLAN_VENDOR_ATTR_ACS_HT40_ENABLED)) ||
+           (params->vht_enabled &&
+            nla_put_flag(msg, QCA_WLAN_VENDOR_ATTR_ACS_VHT_ENABLED)) ||
+           nla_put_u16(msg, QCA_WLAN_VENDOR_ATTR_ACS_CHWIDTH,
+                       params->ch_width) ||
+           (params->ch_list_len &&
+            nla_put(msg, QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST, params->ch_list_len,
+                    params->ch_list)) ||
+           add_acs_freq_list(msg, params->freq_list)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
+       nla_nest_end(msg, data);
+
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: ACS Params: HW_MODE: %d HT: %d HT40: %d VHT: %d BW: %d CH_LIST_LEN: %u",
+                  params->hw_mode, params->ht_enabled, params->ht40_enabled,
+                  params->vht_enabled, params->ch_width, params->ch_list_len);
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Failed to invoke driver ACS function: %s",
+                          strerror(errno));
+       }
+       return ret;
+}
+
+
+static int nl80211_set_band(void *priv, enum set_band band)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       struct nlattr *data;
+       int ret;
+       enum qca_set_band qca_band;
+
+       if (!drv->setband_vendor_cmd_avail)
+               return -1;
+
+       switch (band) {
+       case WPA_SETBAND_AUTO:
+               qca_band = QCA_SETBAND_AUTO;
+               break;
+       case WPA_SETBAND_5G:
+               qca_band = QCA_SETBAND_5G;
+               break;
+       case WPA_SETBAND_2G:
+               qca_band = QCA_SETBAND_2G;
+               break;
+       default:
+               return -1;
+       }
+
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_SETBAND) ||
+           !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u32(msg, QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE, qca_band)) {
+               nlmsg_free(msg);
+               return -ENOBUFS;
+       }
+       nla_nest_end(msg, data);
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Driver setband function failed: %s",
+                          strerror(errno));
+       }
+       return ret;
+}
+
+
+struct nl80211_pcl {
+       unsigned int num;
+       unsigned int *freq_list;
+};
+
+static int preferred_freq_info_handler(struct nl_msg *msg, void *arg)
+{
+       struct nlattr *tb[NL80211_ATTR_MAX + 1];
+       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+       struct nl80211_pcl *param = arg;
+       struct nlattr *nl_vend, *attr;
+       enum qca_iface_type iface_type;
+       struct nlattr *tb_vendor[QCA_WLAN_VENDOR_ATTR_MAX + 1];
+       unsigned int num, max_num;
+       u32 *freqs;
+
+       nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
+                 genlmsg_attrlen(gnlh, 0), NULL);
+
+       nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
+       if (!nl_vend)
+               return NL_SKIP;
+
+       nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_MAX,
+                 nla_data(nl_vend), nla_len(nl_vend), NULL);
+
+       attr = tb_vendor[
+               QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_IFACE_TYPE];
+       if (!attr) {
+               wpa_printf(MSG_ERROR, "nl80211: iface_type couldn't be found");
+               param->num = 0;
+               return NL_SKIP;
+       }
+
+       iface_type = (enum qca_iface_type) nla_get_u32(attr);
+       wpa_printf(MSG_DEBUG, "nl80211: Driver returned iface_type=%d",
+                  iface_type);
+
+       attr = tb_vendor[QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST];
+       if (!attr) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: preferred_freq_list couldn't be found");
+               param->num = 0;
+               return NL_SKIP;
+       }
+
+       /*
+        * param->num has the maximum number of entries for which there
+        * is room in the freq_list provided by the caller.
+        */
+       freqs = nla_data(attr);
+       max_num = nla_len(attr) / sizeof(u32);
+       if (max_num > param->num)
+               max_num = param->num;
+       for (num = 0; num < max_num; num++)
+               param->freq_list[num] = freqs[num];
+       param->num = num;
+
+       return NL_SKIP;
+}
+
+
+static int nl80211_get_pref_freq_list(void *priv,
+                                     enum wpa_driver_if_type if_type,
+                                     unsigned int *num,
+                                     unsigned int *freq_list)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       int ret;
+       unsigned int i;
+       struct nlattr *params;
+       struct nl80211_pcl param;
+       enum qca_iface_type iface_type;
+
+       if (!drv->get_pref_freq_list)
+               return -1;
+
+       switch (if_type) {
+       case WPA_IF_STATION:
+               iface_type = QCA_IFACE_TYPE_STA;
+               break;
+       case WPA_IF_AP_BSS:
+               iface_type = QCA_IFACE_TYPE_AP;
+               break;
+       case WPA_IF_P2P_GO:
+               iface_type = QCA_IFACE_TYPE_P2P_GO;
+               break;
+       case WPA_IF_P2P_CLIENT:
+               iface_type = QCA_IFACE_TYPE_P2P_CLIENT;
+               break;
+       case WPA_IF_IBSS:
+               iface_type = QCA_IFACE_TYPE_IBSS;
+               break;
+       case WPA_IF_TDLS:
+               iface_type = QCA_IFACE_TYPE_TDLS;
+               break;
+       default:
+               return -1;
+       }
+
+       param.num = *num;
+       param.freq_list = freq_list;
+
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_IFINDEX, drv->ifindex) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_GET_PREFERRED_FREQ_LIST) ||
+           !(params = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u32(msg,
+                       QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_IFACE_TYPE,
+                       iface_type)) {
+               wpa_printf(MSG_ERROR,
+                          "%s: err in adding vendor_cmd and vendor_data",
+                          __func__);
+               nlmsg_free(msg);
+               return -1;
+       }
+       nla_nest_end(msg, params);
+
+       os_memset(freq_list, 0, *num * sizeof(freq_list[0]));
+       ret = send_and_recv_msgs(drv, msg, preferred_freq_info_handler, &param);
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "%s: err in send_and_recv_msgs", __func__);
+               return ret;
+       }
+
+       *num = param.num;
+
+       for (i = 0; i < *num; i++) {
+               wpa_printf(MSG_DEBUG, "nl80211: preferred_channel_list[%d]=%d",
+                          i, freq_list[i]);
+       }
+
+       return 0;
+}
+
+
+static int nl80211_set_prob_oper_freq(void *priv, unsigned int freq)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       struct nl_msg *msg;
+       int ret;
+       struct nlattr *params;
+
+       if (!drv->set_prob_oper_freq)
+               return -1;
+
+       wpa_printf(MSG_DEBUG,
+                  "nl80211: Set P2P probable operating freq %u for ifindex %d",
+                  freq, bss->ifindex);
+
+       if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
+           nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
+                       QCA_NL80211_VENDOR_SUBCMD_SET_PROBABLE_OPER_CHANNEL) ||
+           !(params = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+           nla_put_u32(msg,
+                       QCA_WLAN_VENDOR_ATTR_PROBABLE_OPER_CHANNEL_IFACE_TYPE,
+                       QCA_IFACE_TYPE_P2P_CLIENT) ||
+           nla_put_u32(msg,
+                       QCA_WLAN_VENDOR_ATTR_PROBABLE_OPER_CHANNEL_FREQ,
+                       freq)) {
+               wpa_printf(MSG_ERROR,
+                          "%s: err in adding vendor_cmd and vendor_data",
+                          __func__);
+               nlmsg_free(msg);
+               return -1;
+       }
+       nla_nest_end(msg, params);
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       msg = NULL;
+       if (ret) {
+               wpa_printf(MSG_ERROR, "%s: err in send_and_recv_msgs",
+                          __func__);
+               return ret;
+       }
+       nlmsg_free(msg);
+       return 0;
+}
+
+#endif /* CONFIG_DRIVER_NL80211_QCA */
+
+
+static int nl80211_write_to_file(const char *name, unsigned int val)
+{
+       int fd, len;
+       char tmp[128];
+
+       fd = open(name, O_RDWR);
+       if (fd < 0) {
+               wpa_printf(MSG_ERROR, "nl80211: Failed to open %s: %s",
+                          name, strerror(errno));
+               return fd;
+       }
+
+       len = os_snprintf(tmp, sizeof(tmp), "%u\n", val);
+       len = write(fd, tmp, len);
+       if (len < 0)
+               wpa_printf(MSG_ERROR, "nl80211: Failed to write to %s: %s",
+                          name, strerror(errno));
+       close(fd);
+
+       return 0;
+}
+
+
+static int nl80211_configure_data_frame_filters(void *priv, u32 filter_flags)
+{
+       struct i802_bss *bss = priv;
+       char path[128];
+       int ret;
+
+       wpa_printf(MSG_DEBUG, "nl80211: Data frame filter flags=0x%x",
+                  filter_flags);
+
+       /* Configure filtering of unicast frame encrypted using GTK */
+       ret = os_snprintf(path, sizeof(path),
+                         "/proc/sys/net/ipv4/conf/%s/drop_unicast_in_l2_multicast",
+                         bss->ifname);
+       if (os_snprintf_error(sizeof(path), ret))
+               return -1;
+
+       ret = nl80211_write_to_file(path,
+                                   !!(filter_flags &
+                                      WPA_DATA_FRAME_FILTER_FLAG_GTK));
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: Failed to set IPv4 unicast in multicast filter");
+               return ret;
+       }
+
+       os_snprintf(path, sizeof(path),
+                   "/proc/sys/net/ipv6/conf/%s/drop_unicast_in_l2_multicast",
+                   bss->ifname);
+       ret = nl80211_write_to_file(path,
+                                   !!(filter_flags &
+                                      WPA_DATA_FRAME_FILTER_FLAG_GTK));
+
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: Failed to set IPv6 unicast in multicast filter");
+               return ret;
+       }
+
+       /* Configure filtering of unicast frame encrypted using GTK */
+       os_snprintf(path, sizeof(path),
+                   "/proc/sys/net/ipv4/conf/%s/drop_gratuitous_arp",
+                   bss->ifname);
+       ret = nl80211_write_to_file(path,
+                                   !!(filter_flags &
+                                      WPA_DATA_FRAME_FILTER_FLAG_ARP));
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: Failed set gratuitous ARP filter");
+               return ret;
+       }
+
+       /* Configure filtering of IPv6 NA frames */
+       os_snprintf(path, sizeof(path),
+                   "/proc/sys/net/ipv6/conf/%s/drop_unsolicited_na",
+                   bss->ifname);
+       ret = nl80211_write_to_file(path,
+                                   !!(filter_flags &
+                                      WPA_DATA_FRAME_FILTER_FLAG_NA));
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "nl80211: Failed to set unsolicited NA filter");
+               return ret;
+       }
+
+       return 0;
+}
+
+
+static int nl80211_get_ext_capab(void *priv, enum wpa_driver_if_type type,
+                                const u8 **ext_capa, const u8 **ext_capa_mask,
+                                unsigned int *ext_capa_len)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       enum nl80211_iftype nlmode;
+       unsigned int i;
+
+       if (!ext_capa || !ext_capa_mask || !ext_capa_len)
+               return -1;
+
+       nlmode = wpa_driver_nl80211_if_type(type);
+
+       /* By default, use the per-radio values */
+       *ext_capa = drv->extended_capa;
+       *ext_capa_mask = drv->extended_capa_mask;
+       *ext_capa_len = drv->extended_capa_len;
+
+       /* Replace the default value if a per-interface type value exists */
+       for (i = 0; i < drv->num_iface_ext_capa; i++) {
+               if (nlmode == drv->iface_ext_capa[i].iftype) {
+                       *ext_capa = drv->iface_ext_capa[i].ext_capa;
+                       *ext_capa_mask = drv->iface_ext_capa[i].ext_capa_mask;
+                       *ext_capa_len = drv->iface_ext_capa[i].ext_capa_len;
+                       break;
+               }
+       }
+
+       return 0;
+}
+
+
 const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .name = "nl80211",
        .desc = "Linux nl80211/cfg80211",
@@ -9244,6 +9254,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .sched_scan = wpa_driver_nl80211_sched_scan,
        .stop_sched_scan = wpa_driver_nl80211_stop_sched_scan,
        .get_scan_results2 = wpa_driver_nl80211_get_scan_results,
+       .abort_scan = wpa_driver_nl80211_abort_scan,
        .deauthenticate = driver_nl80211_deauthenticate,
        .authenticate = driver_nl80211_authenticate,
        .associate = wpa_driver_nl80211_associate,
@@ -9290,11 +9301,9 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .deinit_ap = wpa_driver_nl80211_deinit_ap,
        .deinit_p2p_cli = wpa_driver_nl80211_deinit_p2p_cli,
        .resume = wpa_driver_nl80211_resume,
-       .send_ft_action = nl80211_send_ft_action,
        .signal_monitor = nl80211_signal_monitor,
        .signal_poll = nl80211_signal_poll,
        .send_frame = nl80211_send_frame,
-       .shared_freq = wpa_driver_nl80211_shared_freq,
        .set_param = nl80211_set_param,
        .get_radio_name = nl80211_get_radio_name,
        .add_pmkid = nl80211_add_pmkid,
@@ -9308,6 +9317,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
 #ifdef CONFIG_TDLS
        .send_tdls_mgmt = nl80211_send_tdls_mgmt,
        .tdls_oper = nl80211_tdls_oper,
+       .tdls_enable_channel_switch = nl80211_tdls_enable_channel_switch,
+       .tdls_disable_channel_switch = nl80211_tdls_disable_channel_switch,
 #endif /* CONFIG_TDLS */
        .update_ft_ies = wpa_driver_nl80211_update_ft_ies,
        .get_mac_addr = wpa_driver_nl80211_get_macaddr,
@@ -9320,12 +9331,16 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .set_ap_wps_ie = wpa_driver_set_ap_wps_p2p_ie,
 #endif /* ANDROID_P2P */
 #ifdef ANDROID
+#ifndef ANDROID_LIB_STUB
        .driver_cmd = wpa_driver_nl80211_driver_cmd,
+#endif /* !ANDROID_LIB_STUB */
 #endif /* ANDROID */
        .vendor_cmd = nl80211_vendor_cmd,
        .set_qos_map = nl80211_set_qos_map,
        .set_wowlan = nl80211_set_wowlan,
+#ifdef CONFIG_DRIVER_NL80211_QCA
        .roaming = nl80211_roaming,
+#endif /* CONFIG_DRIVER_NL80211_QCA */
        .set_mac_addr = nl80211_set_mac_addr,
 #ifdef CONFIG_MESH
        .init_mesh = wpa_driver_nl80211_init_mesh,
@@ -9338,4 +9353,13 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .br_set_net_param = wpa_driver_br_set_net_param,
        .add_tx_ts = nl80211_add_ts,
        .del_tx_ts = nl80211_del_ts,
+       .get_ifindex = nl80211_get_ifindex,
+#ifdef CONFIG_DRIVER_NL80211_QCA
+       .do_acs = wpa_driver_do_acs,
+       .set_band = nl80211_set_band,
+       .get_pref_freq_list = nl80211_get_pref_freq_list,
+       .set_prob_oper_freq = nl80211_set_prob_oper_freq,
+#endif /* CONFIG_DRIVER_NL80211_QCA */
+       .configure_data_frame_filters = nl80211_configure_data_frame_filters,
+       .get_ext_capab = nl80211_get_ext_capab,
 };