Remove unnecessary ifname parameter from sta_add() driver op
[mech_eap.git] / src / drivers / driver_nl80211.c
index 5a36cf8..e566703 100644 (file)
@@ -4,7 +4,7 @@
  * Copyright (c) 2003-2004, Instant802 Networks, Inc.
  * Copyright (c) 2005-2006, Devicescape Software, Inc.
  * Copyright (c) 2007, Johannes Berg <johannes@sipsolutions.net>
- * Copyright (c) 2009, Atheros Communications
+ * Copyright (c) 2009-2010, Atheros Communications
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,6 @@
 
 #include "includes.h"
 #include <sys/ioctl.h>
-#include <net/if_arp.h>
 #include <net/if.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -31,6 +30,7 @@
 #include "eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "netlink.h"
+#include "linux_ioctl.h"
 #include "radiotap.h"
 #include "radiotap_iter.h"
 #include "driver.h"
 #endif
 
 struct i802_bss {
+       struct wpa_driver_nl80211_data *drv;
        struct i802_bss *next;
        int ifindex;
+       char ifname[IFNAMSIZ + 1];
        unsigned int beacon_set:1;
 };
 
@@ -67,7 +69,7 @@ struct wpa_driver_nl80211_data {
        void *ctx;
        struct netlink_data *netlink;
        int ioctl_sock; /* socket for ioctl() use */
-       char ifname[IFNAMSIZ + 1];
+       char brname[IFNAMSIZ];
        int ifindex;
        int if_removed;
        struct wpa_driver_capa capa;
@@ -96,11 +98,20 @@ struct wpa_driver_nl80211_data {
        int monitor_sock;
        int monitor_ifidx;
        int probe_req_report;
+       int disable_11b_rates;
 
-       unsigned int beacon_set:1;
        unsigned int pending_remain_on_chan:1;
+       unsigned int pending_send_action:1;
+       unsigned int added_bridge:1;
+       unsigned int added_if_into_bridge:1;
 
        u64 remain_on_chan_cookie;
+       u64 send_action_cookie;
+
+       struct wpa_driver_scan_filter *filter_ssids;
+       size_t num_filter_ssids;
+
+       struct i802_bss first_bss;
 
 #ifdef HOSTAPD
        int eapol_sock; /* socket for EAPOL frames */
@@ -109,8 +120,6 @@ struct wpa_driver_nl80211_data {
        int *if_indices;
        int num_if_indices;
 
-       struct i802_bss bss;
-
        int last_freq;
        int last_freq_ht;
 #endif /* HOSTAPD */
@@ -130,8 +139,6 @@ static void nl80211_remove_monitor_interface(
 #ifdef HOSTAPD
 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 struct i802_bss * get_bss(struct wpa_driver_nl80211_data *drv,
-                                int ifindex);
 static int i802_set_freq(void *priv, struct hostapd_freq_params *freq);
 static int wpa_driver_nl80211_if_remove(void *priv,
                                        enum wpa_driver_if_type type,
@@ -140,6 +147,8 @@ static int wpa_driver_nl80211_if_remove(void *priv,
 
 static void wpa_driver_nl80211_probe_req_report_timeout(void *eloop_ctx,
                                                        void *timeout_ctx);
+static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
+                                    int ifindex, int disabled);
 
 
 /* nl80211 code */
@@ -172,10 +181,10 @@ static int no_seq_check(struct nl_msg *msg, void *arg)
 }
 
 
-static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
-                             struct nl_msg *msg,
-                             int (*valid_handler)(struct nl_msg *, void *),
-                             void *valid_data)
+static int send_and_recv(struct wpa_driver_nl80211_data *drv,
+                        struct nl_handle *nl_handle, struct nl_msg *msg,
+                        int (*valid_handler)(struct nl_msg *, void *),
+                        void *valid_data)
 {
        struct nl_cb *cb;
        int err = -ENOMEM;
@@ -184,7 +193,7 @@ static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
        if (!cb)
                goto out;
 
-       err = nl_send_auto_complete(drv->nl_handle, msg);
+       err = nl_send_auto_complete(nl_handle, msg);
        if (err < 0)
                goto out;
 
@@ -199,7 +208,7 @@ static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
                          valid_handler, valid_data);
 
        while (err > 0)
-               nl_recvmsgs(drv->nl_handle, cb);
+               nl_recvmsgs(nl_handle, cb);
  out:
        nl_cb_put(cb);
        nlmsg_free(msg);
@@ -207,6 +216,16 @@ static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv,
+                             struct nl_msg *msg,
+                             int (*valid_handler)(struct nl_msg *, void *),
+                             void *valid_data)
+{
+       return send_and_recv(drv, drv->nl_handle, msg, valid_handler,
+                            valid_data);
+}
+
+
 struct family_data {
        const char *group;
        int id;
@@ -269,53 +288,10 @@ nla_put_failure:
 }
 
 
-static int get_ifhwaddr(struct wpa_driver_nl80211_data *drv,
-                       const char *ifname, u8 *addr)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
-       if (ioctl(drv->ioctl_sock, SIOCGIFHWADDR, &ifr)) {
-               wpa_printf(MSG_ERROR, "%s: ioctl(SIOCGIFHWADDR): %d (%s)",
-                          ifname, errno, strerror(errno));
-               return -1;
-       }
-
-       if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
-               wpa_printf(MSG_ERROR, "%s: Invalid HW-addr family 0x%04x",
-                          ifname, ifr.ifr_hwaddr.sa_family);
-               return -1;
-       }
-       os_memcpy(addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
-
-       return 0;
-}
-
-
-static int set_ifhwaddr(struct wpa_driver_nl80211_data *drv,
-                       const char *ifname, const u8 *addr)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
-       os_memcpy(ifr.ifr_hwaddr.sa_data, addr, ETH_ALEN);
-       ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-
-       if (ioctl(drv->ioctl_sock, SIOCSIFHWADDR, &ifr)) {
-               wpa_printf(MSG_DEBUG, "%s: ioctl(SIOCSIFHWADDR): %d (%s)",
-                          ifname, errno, strerror(errno));
-               return -1;
-       }
-
-       return 0;
-}
-
-
 static int wpa_driver_nl80211_get_bssid(void *priv, u8 *bssid)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        if (!drv->associated)
                return -1;
        os_memcpy(bssid, drv->bssid, ETH_ALEN);
@@ -325,7 +301,8 @@ static int wpa_driver_nl80211_get_bssid(void *priv, u8 *bssid)
 
 static int wpa_driver_nl80211_get_ssid(void *priv, u8 *ssid)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        if (!drv->associated)
                return -1;
        os_memcpy(ssid, drv->ssid, drv->ssid_len);
@@ -350,7 +327,7 @@ static void wpa_driver_nl80211_event_link(struct wpa_driver_nl80211_data *drv,
                   event.interface_status.ifname,
                   del ? "removed" : "added");
 
-       if (os_strcmp(drv->ifname, event.interface_status.ifname) == 0) {
+       if (os_strcmp(drv->first_bss.ifname, event.interface_status.ifname) == 0) {
                if (del)
                        drv->if_removed = 1;
                else
@@ -373,7 +350,7 @@ static int wpa_driver_nl80211_own_ifname(struct wpa_driver_nl80211_data *drv,
        rta_len = RTA_ALIGN(sizeof(struct rtattr));
        while (RTA_OK(attr, attrlen)) {
                if (attr->rta_type == IFLA_IFNAME) {
-                       if (os_strcmp(((char *) attr) + rta_len, drv->ifname)
+                       if (os_strcmp(((char *) attr) + rta_len, drv->first_bss.ifname)
                            == 0)
                                return 1;
                        else
@@ -393,7 +370,7 @@ 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)) {
-               drv->ifindex = if_nametoindex(drv->ifname);
+               drv->first_bss.ifindex = if_nametoindex(drv->first_bss.ifname);
                wpa_printf(MSG_DEBUG, "nl80211: Update ifindex for a removed "
                           "interface");
                wpa_driver_nl80211_finish_drv_init(drv);
@@ -619,9 +596,74 @@ static void mlme_timeout_event(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static void mlme_event_action(struct wpa_driver_nl80211_data *drv,
+                             struct nlattr *freq, const u8 *frame, size_t len)
+{
+       const struct ieee80211_mgmt *mgmt;
+       union wpa_event_data event;
+       u16 fc, stype;
+
+       mgmt = (const struct ieee80211_mgmt *) frame;
+       if (len < 24) {
+               wpa_printf(MSG_DEBUG, "nl80211: Too short action frame");
+               return;
+       }
+
+       fc = le_to_host16(mgmt->frame_control);
+       stype = WLAN_FC_GET_STYPE(fc);
+
+       os_memset(&event, 0, sizeof(event));
+       event.rx_action.da = mgmt->da;
+       event.rx_action.sa = mgmt->sa;
+       event.rx_action.bssid = mgmt->bssid;
+       event.rx_action.category = mgmt->u.action.category;
+       event.rx_action.data = &mgmt->u.action.category + 1;
+       event.rx_action.len = frame + len - event.rx_action.data;
+       if (freq)
+               event.rx_action.freq = nla_get_u32(freq);
+       wpa_supplicant_event(drv->ctx, EVENT_RX_ACTION, &event);
+}
+
+
+static void mlme_event_action_tx_status(struct wpa_driver_nl80211_data *drv,
+                                       struct nlattr *cookie, const u8 *frame,
+                                       size_t len, struct nlattr *ack)
+{
+       union wpa_event_data event;
+       const struct ieee80211_hdr *hdr;
+       u16 fc;
+       u64 cookie_val;
+
+       if (!cookie)
+               return;
+
+       cookie_val = nla_get_u64(cookie);
+       wpa_printf(MSG_DEBUG, "nl80211: Action TX status: cookie=0%llx%s",
+                  (long long unsigned int) cookie_val,
+                  cookie_val == drv->send_action_cookie ?
+                  " (match)" : " (unknown)");
+       if (cookie_val != drv->send_action_cookie)
+               return;
+
+       hdr = (const struct ieee80211_hdr *) frame;
+       fc = le_to_host16(hdr->frame_control);
+
+       os_memset(&event, 0, sizeof(event));
+       event.tx_status.type = WLAN_FC_GET_TYPE(fc);
+       event.tx_status.stype = WLAN_FC_GET_STYPE(fc);
+       event.tx_status.dst = hdr->addr1;
+       event.tx_status.data = frame;
+       event.tx_status.data_len = len;
+       event.tx_status.ack = ack != NULL;
+       wpa_supplicant_event(drv->ctx, EVENT_TX_STATUS, &event);
+}
+
+
 static void mlme_event(struct wpa_driver_nl80211_data *drv,
                       enum nl80211_commands cmd, struct nlattr *frame,
-                      struct nlattr *addr, struct nlattr *timed_out)
+                      struct nlattr *addr, struct nlattr *timed_out,
+                      struct nlattr *freq, struct nlattr *ack,
+                      struct nlattr *cookie)
 {
        if (timed_out && addr) {
                mlme_timeout_event(drv, cmd, addr);
@@ -653,6 +695,13 @@ static void mlme_event(struct wpa_driver_nl80211_data *drv,
                drv->associated = 0;
                wpa_supplicant_event(drv->ctx, EVENT_DISASSOC, NULL);
                break;
+       case NL80211_CMD_ACTION:
+               mlme_event_action(drv, freq, nla_data(frame), nla_len(frame));
+               break;
+       case NL80211_CMD_ACTION_TX_STATUS:
+               mlme_event_action_tx_status(drv, cookie, nla_data(frame),
+                                           nla_len(frame), ack);
+               break;
        default:
                break;
        }
@@ -822,7 +871,8 @@ static int process_event(struct nl_msg *msg, void *arg)
        if (drv->ap_scan_as_station &&
            (gnlh->cmd == NL80211_CMD_NEW_SCAN_RESULTS ||
             gnlh->cmd == NL80211_CMD_SCAN_ABORTED)) {
-               wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_AP);
+               wpa_driver_nl80211_set_mode(&drv->first_bss,
+                                           IEEE80211_MODE_AP);
                drv->ap_scan_as_station = 0;
        }
 
@@ -851,8 +901,12 @@ static int process_event(struct nl_msg *msg, void *arg)
        case NL80211_CMD_ASSOCIATE:
        case NL80211_CMD_DEAUTHENTICATE:
        case NL80211_CMD_DISASSOCIATE:
+       case NL80211_CMD_ACTION:
+       case NL80211_CMD_ACTION_TX_STATUS:
                mlme_event(drv, gnlh->cmd, tb[NL80211_ATTR_FRAME],
-                          tb[NL80211_ATTR_MAC], tb[NL80211_ATTR_TIMED_OUT]);
+                          tb[NL80211_ATTR_MAC], tb[NL80211_ATTR_TIMED_OUT],
+                          tb[NL80211_ATTR_WIPHY_FREQ], tb[NL80211_ATTR_ACK],
+                          tb[NL80211_ATTR_COOKIE]);
                break;
        case NL80211_CMD_CONNECT:
        case NL80211_CMD_ROAM:
@@ -915,43 +969,6 @@ static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx,
 }
 
 
-static int hostapd_set_iface_flags(struct wpa_driver_nl80211_data *drv,
-                                  const char *ifname, int dev_up)
-{
-       struct ifreq ifr;
-
-       if (drv->ioctl_sock < 0)
-               return -1;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-       if (ioctl(drv->ioctl_sock, SIOCGIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCGIFFLAGS]");
-               wpa_printf(MSG_DEBUG, "Could not read interface flags (%s)",
-                          ifname);
-               return -1;
-       }
-
-       if (dev_up) {
-               if (ifr.ifr_flags & IFF_UP)
-                       return 0;
-               ifr.ifr_flags |= IFF_UP;
-       } else {
-               if (!(ifr.ifr_flags & IFF_UP))
-                       return 0;
-               ifr.ifr_flags &= ~IFF_UP;
-       }
-
-       if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCSIFFLAGS]");
-               return -1;
-       }
-
-       return 0;
-}
-
-
 /**
  * wpa_driver_nl80211_set_country - ask nl80211 to set the regulatory domain
  * @priv: driver_nl80211 private data
@@ -963,7 +980,8 @@ static int hostapd_set_iface_flags(struct wpa_driver_nl80211_data *drv,
  */
 static int wpa_driver_nl80211_set_country(void *priv, const char *alpha2_arg)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        char alpha2[3];
        struct nl_msg *msg;
 
@@ -1052,7 +1070,7 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_GET_WIPHY, 0);
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->first_bss.ifindex);
 
        if (send_and_recv_msgs(drv, msg, wiphy_info_handler, info) == 0)
                return 0;
@@ -1226,12 +1244,15 @@ static void * wpa_driver_nl80211_init(void *ctx, const char *ifname)
 {
        struct wpa_driver_nl80211_data *drv;
        struct netlink_config *cfg;
+       struct i802_bss *bss;
 
        drv = os_zalloc(sizeof(*drv));
        if (drv == NULL)
                return NULL;
        drv->ctx = ctx;
-       os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
+       bss = &drv->first_bss;
+       bss->drv = drv;
+       os_strlcpy(bss->ifname, ifname, sizeof(bss->ifname));
        drv->monitor_ifidx = -1;
        drv->monitor_sock = -1;
        drv->ioctl_sock = -1;
@@ -1261,7 +1282,7 @@ static void * wpa_driver_nl80211_init(void *ctx, const char *ifname)
        if (wpa_driver_nl80211_finish_drv_init(drv))
                goto failed;
 
-       return drv;
+       return bss;
 
 failed:
        netlink_deinit(drv->netlink);
@@ -1272,26 +1293,72 @@ failed:
        nl_cache_free(drv->nl_cache);
        nl_handle_destroy(drv->nl_handle);
        nl_cb_put(drv->nl_cb);
+       eloop_unregister_read_sock(nl_socket_get_fd(drv->nl_handle_event));
 
        os_free(drv);
        return NULL;
 }
 
 
+static int nl80211_register_action_frame(struct wpa_driver_nl80211_data *drv,
+                                        const u8 *match, size_t match_len)
+{
+       struct nl_msg *msg;
+       int ret = -1;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -1;
+
+       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
+                   NL80211_CMD_REGISTER_ACTION, 0);
+
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+       NLA_PUT(msg, NL80211_ATTR_FRAME_MATCH, match_len, match);
+
+       ret = send_and_recv(drv, drv->nl_handle_event, msg, NULL, NULL);
+       msg = NULL;
+       if (ret) {
+               wpa_printf(MSG_DEBUG, "nl80211: Register Action command "
+                          "failed: ret=%d (%s)", ret, strerror(-ret));
+               wpa_hexdump(MSG_DEBUG, "nl80211: Register Action match",
+                           match, match_len);
+               goto nla_put_failure;
+       }
+       ret = 0;
+nla_put_failure:
+       nlmsg_free(msg);
+       return ret;
+}
+
+
+static int nl80211_register_action_frames(struct wpa_driver_nl80211_data *drv)
+{
+       if (0) {
+               /* Public Action frames */
+               return nl80211_register_action_frame(drv, (u8 *) "\x04", 1);
+       }
+       return 0;
+}
+
+
 static int
 wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
 {
-       drv->ifindex = if_nametoindex(drv->ifname);
+       struct i802_bss *bss = &drv->first_bss;
+
+       drv->ifindex = if_nametoindex(bss->ifname);
+       drv->first_bss.ifindex = drv->ifindex;
 
 #ifndef HOSTAPD
-       if (wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_INFRA) < 0) {
+       if (wpa_driver_nl80211_set_mode(bss, IEEE80211_MODE_INFRA) < 0) {
                wpa_printf(MSG_DEBUG, "nl80211: Could not configure driver to "
                           "use managed mode");
        }
 
-       if (hostapd_set_iface_flags(drv, drv->ifname, 1)) {
-               wpa_printf(MSG_ERROR, "Could not set interface '%s' "
-                          "UP", drv->ifname);
+       if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 1)) {
+               wpa_printf(MSG_ERROR, "Could not set interface '%s' UP",
+                          bss->ifname);
                return -1;
        }
 
@@ -1302,22 +1369,11 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
                               1, IF_OPER_DORMANT);
 #endif /* HOSTAPD */
 
-       return 0;
-}
-
+       if (nl80211_register_action_frames(drv) < 0)
+               return -1;
 
-#ifdef HOSTAPD
-static void wpa_driver_nl80211_free_bss(struct wpa_driver_nl80211_data *drv)
-{
-       struct i802_bss *bss, *prev;
-       bss = drv->bss.next;
-       while (bss) {
-               prev = bss;
-               bss = bss->next;
-               os_free(bss);
-       }
+       return 0;
 }
-#endif /* HOSTAPD */
 
 
 static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
@@ -1347,7 +1403,22 @@ static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
  */
 static void wpa_driver_nl80211_deinit(void *priv)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       if (drv->added_if_into_bridge) {
+               if (linux_br_del_if(drv->ioctl_sock, drv->brname, bss->ifname)
+                   < 0)
+                       wpa_printf(MSG_INFO, "nl80211: Failed to remove "
+                                  "interface %s from bridge %s: %s",
+                                  bss->ifname, drv->brname, strerror(errno));
+       }
+       if (drv->added_bridge) {
+               if (linux_br_del(drv->ioctl_sock, drv->brname) < 0)
+                       wpa_printf(MSG_INFO, "nl80211: Failed to remove "
+                                  "bridge %s: %s",
+                                  drv->brname, strerror(errno));
+       }
 
        nl80211_remove_monitor_interface(drv);
 
@@ -1370,17 +1441,18 @@ static void wpa_driver_nl80211_deinit(void *priv)
 
        if (drv->if_indices != drv->default_if_indices)
                os_free(drv->if_indices);
-
-       wpa_driver_nl80211_free_bss(drv);
 #endif /* HOSTAPD */
 
+       if (drv->disable_11b_rates)
+               nl80211_disable_11b_rates(drv, drv->ifindex, 0);
+
        netlink_send_oper_ifla(drv->netlink, drv->ifindex, 0, IF_OPER_UP);
        netlink_deinit(drv->netlink);
 
        eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx);
 
-       (void) hostapd_set_iface_flags(drv, drv->ifname, 0);
-       wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_INFRA);
+       (void) linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 0);
+       wpa_driver_nl80211_set_mode(bss, IEEE80211_MODE_INFRA);
 
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
@@ -1396,6 +1468,8 @@ static void wpa_driver_nl80211_deinit(void *priv)
        eloop_cancel_timeout(wpa_driver_nl80211_probe_req_report_timeout,
                             drv, NULL);
 
+       os_free(drv->filter_ssids);
+
        os_free(drv);
 }
 
@@ -1412,7 +1486,8 @@ static void wpa_driver_nl80211_scan_timeout(void *eloop_ctx, void *timeout_ctx)
 {
        struct wpa_driver_nl80211_data *drv = eloop_ctx;
        if (drv->ap_scan_as_station) {
-               wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_AP);
+               wpa_driver_nl80211_set_mode(&drv->first_bss,
+                                           IEEE80211_MODE_AP);
                drv->ap_scan_as_station = 0;
        }
        wpa_printf(MSG_DEBUG, "Scan timeout - try to get results");
@@ -1429,7 +1504,8 @@ static void wpa_driver_nl80211_scan_timeout(void *eloop_ctx, void *timeout_ctx)
 static int wpa_driver_nl80211_scan(void *priv,
                                   struct wpa_driver_scan_params *params)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret = 0, timeout;
        struct nl_msg *msg, *ssids, *freqs;
        size_t i;
@@ -1444,6 +1520,11 @@ static int wpa_driver_nl80211_scan(void *priv,
                return -1;
        }
 
+       os_free(drv->filter_ssids);
+       drv->filter_ssids = params->filter_ssids;
+       params->filter_ssids = NULL;
+       drv->num_filter_ssids = params->num_filter_ssids;
+
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
                    NL80211_CMD_TRIGGER_SCAN, 0);
 
@@ -1478,12 +1559,12 @@ static int wpa_driver_nl80211_scan(void *priv,
                         * mac80211 does not allow scan requests in AP mode, so
                         * try to do this in station mode.
                         */
-                       if (wpa_driver_nl80211_set_mode(drv,
+                       if (wpa_driver_nl80211_set_mode(bss,
                                                        IEEE80211_MODE_INFRA))
                                goto nla_put_failure;
 
                        if (wpa_driver_nl80211_scan(drv, params)) {
-                               wpa_driver_nl80211_set_mode(drv,
+                               wpa_driver_nl80211_set_mode(bss,
                                                            IEEE80211_MODE_AP);
                                goto nla_put_failure;
                        }
@@ -1523,6 +1604,57 @@ nla_put_failure:
 }
 
 
+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;
+}
+
+
+struct nl80211_bss_info_arg {
+       struct wpa_driver_nl80211_data *drv;
+       struct wpa_scan_results *res;
+};
+
 static int bss_info_handler(struct nl_msg *msg, void *arg)
 {
        struct nlattr *tb[NL80211_ATTR_MAX + 1];
@@ -1539,12 +1671,15 @@ static int bss_info_handler(struct nl_msg *msg, void *arg)
                [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 wpa_scan_results *res = arg;
+       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;
-       size_t ie_len;
+       const u8 *ie, *beacon_ie;
+       size_t ie_len, beacon_ie_len;
+       u8 *pos;
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
                  genlmsg_attrlen(gnlh, 0), NULL);
@@ -1560,8 +1695,19 @@ static int bss_info_handler(struct nl_msg *msg, void *arg)
                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;
+       }
 
-       r = os_zalloc(sizeof(*r) + ie_len);
+       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])
@@ -1588,8 +1734,14 @@ static int bss_info_handler(struct nl_msg *msg, void *arg)
        if (bss[NL80211_BSS_SEEN_MS_AGO])
                r->age = nla_get_u32(bss[NL80211_BSS_SEEN_MS_AGO]);
        r->ie_len = ie_len;
-       if (ie)
-               os_memcpy(r + 1, ie, 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;
@@ -1624,7 +1776,7 @@ static void clear_state_mismatch(struct wpa_driver_nl80211_data *drv,
 {
        if (drv->capa.flags & WPA_DRIVER_FLAGS_SME) {
                wpa_printf(MSG_DEBUG, "nl80211: Clear possible state "
-                          "mismatch");
+                          "mismatch (" MACSTR ")", MAC2STR(addr));
                wpa_driver_nl80211_mlme(drv, addr,
                                        NL80211_CMD_DEAUTHENTICATE,
                                        WLAN_REASON_PREV_AUTH_NOT_VALID);
@@ -1653,6 +1805,7 @@ static void wpa_driver_nl80211_check_bss_status(
                                           " assoc=" MACSTR ")",
                                           MAC2STR(drv->auth_bssid),
                                           MAC2STR(drv->bssid));
+                               clear_state_mismatch(drv, r->bssid);
                        }
                }
 
@@ -1682,18 +1835,27 @@ static void wpa_driver_nl80211_check_bss_status(
 }
 
 
-/**
- * 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 void wpa_scan_results_free(struct wpa_scan_results *res)
+{
+       size_t i;
+
+       if (res == NULL)
+               return;
+
+       for (i = 0; i < res->num; i++)
+               os_free(res->res[i]);
+       os_free(res->res);
+       os_free(res);
+}
+
+
 static struct wpa_scan_results *
-wpa_driver_nl80211_get_scan_results(void *priv)
+nl80211_get_scan_results(struct wpa_driver_nl80211_data *drv)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
        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)
@@ -1706,12 +1868,13 @@ wpa_driver_nl80211_get_scan_results(void *priv)
                    NL80211_CMD_GET_SCAN, 0);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
 
-       ret = send_and_recv_msgs(drv, msg, bss_info_handler, res);
+       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, "Received scan results (%lu BSSes)",
                           (unsigned long) res->num);
-               wpa_driver_nl80211_check_bss_status(drv, res);
                return res;
        }
        wpa_printf(MSG_DEBUG, "nl80211: Scan result fetch failed: ret=%d "
@@ -1723,13 +1886,57 @@ nla_put_failure:
 }
 
 
+/**
+ * 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 int wpa_driver_nl80211_set_key(const char *ifname, void *priv,
                                      enum wpa_alg alg, const u8 *addr,
                                      int key_idx, int set_tx,
                                      const u8 *seq, size_t seq_len,
                                      const u8 *key, size_t key_len)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ifindex = if_nametoindex(ifname);
        struct nl_msg *msg;
        int ret;
@@ -1986,7 +2193,8 @@ static int wpa_driver_nl80211_disconnect(struct wpa_driver_nl80211_data *drv,
 static int wpa_driver_nl80211_deauthenticate(void *priv, const u8 *addr,
                                             int reason_code)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME))
                return wpa_driver_nl80211_disconnect(drv, addr, reason_code);
        wpa_printf(MSG_DEBUG, "%s", __func__);
@@ -1999,7 +2207,8 @@ static int wpa_driver_nl80211_deauthenticate(void *priv, const u8 *addr,
 static int wpa_driver_nl80211_disassociate(void *priv, const u8 *addr,
                                           int reason_code)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME))
                return wpa_driver_nl80211_disconnect(drv, addr, reason_code);
        wpa_printf(MSG_DEBUG, "%s", __func__);
@@ -2012,7 +2221,8 @@ static int wpa_driver_nl80211_disassociate(void *priv, const u8 *addr,
 static int wpa_driver_nl80211_authenticate(
        void *priv, struct wpa_driver_auth_params *params)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret = -1, i;
        struct nl_msg *msg;
        enum nl80211_auth_type type;
@@ -2020,8 +2230,11 @@ static int wpa_driver_nl80211_authenticate(
 
        drv->associated = 0;
        os_memset(drv->auth_bssid, 0, ETH_ALEN);
+       /* FIX: IBSS mode */
+       if (drv->nlmode != NL80211_IFTYPE_STATION)
+               wpa_driver_nl80211_set_mode(priv, IEEE80211_MODE_INFRA);
 
-       if (wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_INFRA) < 0)
+       if (wpa_driver_nl80211_set_mode(priv, IEEE80211_MODE_INFRA) < 0)
                return -1;
 
 retry:
@@ -2038,7 +2251,7 @@ retry:
        for (i = 0; i < 4; i++) {
                if (!params->wep_key[i])
                        continue;
-               wpa_driver_nl80211_set_key(drv->ifname, drv, WPA_ALG_WEP, NULL,
+               wpa_driver_nl80211_set_key(bss->ifname, drv, WPA_ALG_WEP, NULL,
                                           i,
                                           i == params->wep_tx_keyidx, NULL, 0,
                                           params->wep_key[i],
@@ -2075,13 +2288,13 @@ retry:
         * TODO: if multiple auth_alg options enabled, try them one by one if
         * the AP rejects authentication due to unknown auth alg
         */
-       if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM)
+       if (params->auth_alg & WPA_AUTH_ALG_OPEN)
                type = NL80211_AUTHTYPE_OPEN_SYSTEM;
-       else if (params->auth_alg & AUTH_ALG_SHARED_KEY)
+       else if (params->auth_alg & WPA_AUTH_ALG_SHARED)
                type = NL80211_AUTHTYPE_SHARED_KEY;
-       else if (params->auth_alg & AUTH_ALG_LEAP)
+       else if (params->auth_alg & WPA_AUTH_ALG_LEAP)
                type = NL80211_AUTHTYPE_NETWORK_EAP;
-       else if (params->auth_alg & AUTH_ALG_FT)
+       else if (params->auth_alg & WPA_AUTH_ALG_FT)
                type = NL80211_AUTHTYPE_FT;
        else
                goto nla_put_failure;
@@ -2373,7 +2586,8 @@ wpa_driver_nl80211_add_11b(struct hostapd_hw_modes *modes, u16 *num_modes)
 static struct hostapd_hw_modes *
 wpa_driver_nl80211_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct phy_info_arg result = {
                .num_modes = num_modes,
@@ -2442,7 +2656,8 @@ static int wpa_driver_nl80211_send_frame(struct wpa_driver_nl80211_data *drv,
 static int wpa_driver_nl80211_send_mlme(void *priv, const u8 *data,
                                        size_t data_len)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct ieee80211_mgmt *mgmt;
        int encrypt = 1;
        u16 fc;
@@ -2468,27 +2683,20 @@ static int wpa_driver_nl80211_send_mlme(void *priv, const u8 *data,
 }
 
 
-static int wpa_driver_nl80211_set_beacon(const char *ifname, void *priv,
+static int wpa_driver_nl80211_set_beacon(void *priv,
                                         const u8 *head, size_t head_len,
                                         const u8 *tail, size_t tail_len,
                                         int dtim_period, int beacon_int)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        u8 cmd = NL80211_CMD_NEW_BEACON;
        int ret;
        int beacon_set;
-       int ifindex = if_nametoindex(ifname);
-#ifdef HOSTAPD
-       struct i802_bss *bss;
+       int ifindex = if_nametoindex(bss->ifname);
 
-       bss = get_bss(drv, ifindex);
-       if (bss == NULL)
-               return -ENOENT;
        beacon_set = bss->beacon_set;
-#else /* HOSTAPD */
-       beacon_set = drv->beacon_set;
-#endif /* HOSTAPD */
 
        msg = nlmsg_alloc();
        if (!msg)
@@ -2512,11 +2720,7 @@ static int wpa_driver_nl80211_set_beacon(const char *ifname, void *priv,
                wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)",
                           ret, strerror(-ret));
        } else {
-#ifdef HOSTAPD
                bss->beacon_set = 1;
-#else /* HOSTAPD */
-               drv->beacon_set = 1;
-#endif /* HOSTAPD */
        }
        return ret;
  nla_put_failure:
@@ -2567,10 +2771,11 @@ nla_put_failure:
 }
 
 
-static int wpa_driver_nl80211_sta_add(const char *ifname, void *priv,
+static int wpa_driver_nl80211_sta_add(void *priv,
                                      struct hostapd_sta_add_params *params)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret = -ENOBUFS;
 
@@ -2581,7 +2786,7 @@ static int wpa_driver_nl80211_sta_add(const char *ifname, void *priv,
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_NEW_STATION, 0);
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(ifname));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, params->addr);
        NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, params->aid);
        NLA_PUT(msg, NL80211_ATTR_STA_SUPPORTED_RATES, params->supp_rates_len,
@@ -2607,7 +2812,8 @@ static int wpa_driver_nl80211_sta_add(const char *ifname, void *priv,
 
 static int wpa_driver_nl80211_sta_remove(void *priv, const u8 *addr)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret;
 
@@ -2619,7 +2825,7 @@ static int wpa_driver_nl80211_sta_remove(void *priv, const u8 *addr)
                    0, NL80211_CMD_DEL_STATION, 0);
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(drv->ifname));
+                   if_nametoindex(bss->ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
 
        ret = send_and_recv_msgs(drv, msg, NULL, NULL);
@@ -2654,8 +2860,7 @@ static void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv,
        if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
                return;
  nla_put_failure:
-       wpa_printf(MSG_ERROR, "Failed to remove interface (ifidx=%d).\n",
-                  ifidx);
+       wpa_printf(MSG_ERROR, "Failed to remove interface (ifidx=%d)", ifidx);
 }
 
 
@@ -2718,7 +2923,7 @@ static int nl80211_create_iface_once(struct wpa_driver_nl80211_data *drv,
 #endif /* HOSTAPD */
 
        if (addr && iftype != NL80211_IFTYPE_MONITOR &&
-           set_ifhwaddr(drv, ifname, addr)) {
+           linux_set_ifhwaddr(drv->ioctl_sock, ifname, addr)) {
                nl80211_remove_iface(drv, ifidx);
                return -1;
        }
@@ -2747,6 +2952,9 @@ static int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
                                                wds);
        }
 
+       if (ret >= 0 && drv->disable_11b_rates)
+               nl80211_disable_11b_rates(drv, ret, 1);
+
        return ret;
 }
 
@@ -3054,7 +3262,7 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
        int optval;
        socklen_t optlen;
 
-       snprintf(buf, IFNAMSIZ, "mon.%s", drv->ifname);
+       snprintf(buf, IFNAMSIZ, "mon.%s", drv->first_bss.ifname);
        buf[IFNAMSIZ - 1] = '\0';
 
        drv->monitor_ifidx =
@@ -3064,7 +3272,7 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
        if (drv->monitor_ifidx < 0)
                return -1;
 
-       if (hostapd_set_iface_flags(drv, buf, 1))
+       if (linux_set_iface_flags(drv->ioctl_sock, buf, 1))
                goto error;
 
        memset(&ll, 0, sizeof(ll));
@@ -3114,7 +3322,8 @@ static int wpa_driver_nl80211_hapd_send_eapol(
        void *priv, const u8 *addr, const u8 *data,
        size_t data_len, int encrypt, const u8 *own_addr)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct ieee80211_hdr *hdr;
        size_t len;
        u8 *pos;
@@ -3195,11 +3404,12 @@ static u32 sta_flags_nl80211(int flags)
 }
 
 
-static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
-                                           int total_flags, int flags_or,
-                                           int flags_and)
+static int wpa_driver_nl80211_sta_set_flags(const char *ifname, void *priv,
+                                           const u8 *addr, int total_flags,
+                                           int flags_or, int flags_and)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg, *flags = NULL;
        struct nl80211_sta_flag_update upd;
 
@@ -3217,7 +3427,7 @@ static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
                    0, NL80211_CMD_SET_STATION, 0);
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(drv->ifname));
+                   if_nametoindex(ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
 
        /*
@@ -3256,7 +3466,7 @@ static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
 static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv,
                                 struct wpa_driver_associate_params *params)
 {
-       if (wpa_driver_nl80211_set_mode(drv, params->mode) ||
+       if (wpa_driver_nl80211_set_mode(&drv->first_bss, params->mode) ||
            wpa_driver_nl80211_set_freq(drv, params->freq, 0, 0)) {
                nl80211_remove_monitor_interface(drv);
                return -1;
@@ -3307,7 +3517,7 @@ static int wpa_driver_nl80211_ibss(struct wpa_driver_nl80211_data *drv,
 
        wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
 
-       if (wpa_driver_nl80211_set_mode(drv, params->mode)) {
+       if (wpa_driver_nl80211_set_mode(&drv->first_bss, params->mode)) {
                wpa_printf(MSG_INFO, "nl80211: Failed to set interface into "
                           "IBSS mode");
                return -1;
@@ -3413,13 +3623,13 @@ static int wpa_driver_nl80211_connect(
                NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len,
                        params->wpa_ie);
 
-       if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM)
+       if (params->auth_alg & WPA_AUTH_ALG_OPEN)
                type = NL80211_AUTHTYPE_OPEN_SYSTEM;
-       else if (params->auth_alg & AUTH_ALG_SHARED_KEY)
+       else if (params->auth_alg & WPA_AUTH_ALG_SHARED)
                type = NL80211_AUTHTYPE_SHARED_KEY;
-       else if (params->auth_alg & AUTH_ALG_LEAP)
+       else if (params->auth_alg & WPA_AUTH_ALG_LEAP)
                type = NL80211_AUTHTYPE_NETWORK_EAP;
-       else if (params->auth_alg & AUTH_ALG_FT)
+       else if (params->auth_alg & WPA_AUTH_ALG_FT)
                type = NL80211_AUTHTYPE_FT;
        else
                goto nla_put_failure;
@@ -3521,7 +3731,8 @@ nla_put_failure:
 static int wpa_driver_nl80211_associate(
        void *priv, struct wpa_driver_associate_params *params)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret = -1;
        struct nl_msg *msg;
 
@@ -3532,7 +3743,7 @@ static int wpa_driver_nl80211_associate(
                return wpa_driver_nl80211_ibss(drv, params);
 
        if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME)) {
-               if (wpa_driver_nl80211_set_mode(drv, params->mode) < 0)
+               if (wpa_driver_nl80211_set_mode(priv, params->mode) < 0)
                        return -1;
                return wpa_driver_nl80211_connect(drv, params);
        }
@@ -3594,6 +3805,7 @@ static int wpa_driver_nl80211_associate(
        if (ret) {
                wpa_printf(MSG_DEBUG, "nl80211: MLME command failed: ret=%d "
                           "(%s)", ret, strerror(-ret));
+               nl80211_dump_scan(drv);
                goto nla_put_failure;
        }
        ret = 0;
@@ -3633,7 +3845,8 @@ nla_put_failure:
 
 static int wpa_driver_nl80211_set_mode(void *priv, int mode)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret = -1;
        int nlmode;
 
@@ -3668,10 +3881,10 @@ static int wpa_driver_nl80211_set_mode(void *priv, int mode)
         * take the device down, try to set the mode again, and bring the
         * device back up.
         */
-       if (hostapd_set_iface_flags(drv, drv->ifname, 0) == 0) {
+       if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 0) == 0) {
                /* Try to set the mode again while the interface is down */
                ret = nl80211_set_mode(drv, drv->ifindex, nlmode);
-               if (hostapd_set_iface_flags(drv, drv->ifname, 1))
+               if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 1))
                        ret = -1;
        }
 
@@ -3690,6 +3903,7 @@ done:
        } else if (!ret && nlmode != NL80211_IFTYPE_AP) {
                /* Remove additional AP mode functionality */
                nl80211_remove_monitor_interface(drv);
+               bss->beacon_set = 0;
        }
 
        if (ret)
@@ -3703,7 +3917,8 @@ done:
 static int wpa_driver_nl80211_get_capa(void *priv,
                                       struct wpa_driver_capa *capa)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        if (!drv->has_capability)
                return -1;
        os_memcpy(capa, &drv->capa, sizeof(*capa));
@@ -3713,7 +3928,8 @@ static int wpa_driver_nl80211_get_capa(void *priv,
 
 static int wpa_driver_nl80211_set_operstate(void *priv, int state)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
 
        wpa_printf(MSG_DEBUG, "%s: operstate %d->%d (%s)",
                   __func__, drv->operstate, state, state ? "UP" : "DORMANT");
@@ -3725,7 +3941,8 @@ static int wpa_driver_nl80211_set_operstate(void *priv, int state)
 
 static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nl80211_sta_flag_update upd;
 
@@ -3737,7 +3954,7 @@ static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
                    0, NL80211_CMD_SET_STATION, 0);
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(drv->ifname));
+                   if_nametoindex(bss->ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, drv->bssid);
 
        os_memset(&upd, 0, sizeof(upd));
@@ -3754,20 +3971,6 @@ static int wpa_driver_nl80211_set_supp_port(void *priv, int authorized)
 
 #ifdef HOSTAPD
 
-static struct i802_bss * get_bss(struct wpa_driver_nl80211_data *drv,
-                                int ifindex)
-{
-       struct i802_bss *bss = &drv->bss;
-       while (bss) {
-               if (ifindex == bss->ifindex)
-                       return bss;
-               bss = bss->next;
-       }
-       wpa_printf(MSG_DEBUG, "nl80211: get_bss(%d) failed", ifindex);
-       return NULL;
-}
-
-
 static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
 {
        int i;
@@ -3861,7 +4064,8 @@ static int get_key_handler(struct nl_msg *msg, void *arg)
 static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
                           int idx, u8 *seq)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        msg = nlmsg_alloc();
@@ -3887,7 +4091,8 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
 static int i802_set_rate_sets(void *priv, int *supp_rates, int *basic_rates,
                              int mode)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        u8 rates[NL80211_MAX_SUPP_RATES];
        u8 rates_len = 0;
@@ -3905,8 +4110,7 @@ static int i802_set_rate_sets(void *priv, int *supp_rates, int *basic_rates,
 
        NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, rates_len, rates);
 
-       /* TODO: multi-BSS support */
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->ifname));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
@@ -3917,7 +4121,8 @@ static int i802_set_rate_sets(void *priv, int *supp_rates, int *basic_rates,
 /* Set kernel driver on given frequency (MHz) */
 static int i802_set_freq(void *priv, struct hostapd_freq_params *freq)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        return wpa_driver_nl80211_set_freq(drv, freq->freq, freq->ht_enabled,
                                           freq->sec_channel_offset);
 }
@@ -3925,7 +4130,8 @@ static int i802_set_freq(void *priv, struct hostapd_freq_params *freq)
 
 static int i802_set_rts(void *priv, int rts)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret = -ENOBUFS;
        u32 val;
@@ -3956,7 +4162,8 @@ nla_put_failure:
 
 static int i802_set_frag(void *priv, int frag)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret = -ENOBUFS;
        u32 val;
@@ -3987,7 +4194,8 @@ nla_put_failure:
 
 static int i802_flush(void *priv)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        msg = nlmsg_alloc();
@@ -4001,7 +4209,7 @@ static int i802_flush(void *priv)
         * XXX: FIX! this needs to flush all VLANs too
         */
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(drv->ifname));
+                   if_nametoindex(bss->ifname));
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
@@ -4063,7 +4271,8 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
 static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
                              const u8 *addr)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        os_memset(data, 0, sizeof(*data));
@@ -4075,7 +4284,7 @@ static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
                    0, NL80211_CMD_GET_STATION, 0);
 
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->ifname));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
 
        return send_and_recv_msgs(drv, msg, get_sta_handler, data);
  nla_put_failure:
@@ -4086,7 +4295,8 @@ static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
 static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
                                    int cw_min, int cw_max, int burst_time)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        struct nlattr *txq, *params;
 
@@ -4097,7 +4307,7 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_WIPHY, 0);
 
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->ifname));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
 
        txq = nla_nest_start(msg, NL80211_ATTR_WIPHY_TXQ_PARAMS);
        if (!txq)
@@ -4129,7 +4339,8 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
 
 static int i802_set_bss(void *priv, int cts, int preamble, int slot)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        msg = nlmsg_alloc();
@@ -4146,8 +4357,7 @@ static int i802_set_bss(void *priv, int cts, int preamble, int slot)
        if (slot >= 0)
                NLA_PUT_U8(msg, NL80211_ATTR_BSS_SHORT_SLOT_TIME, slot);
 
-       /* TODO: multi-BSS support */
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->ifname));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname));
 
        return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
@@ -4176,7 +4386,8 @@ static int i802_set_short_slot_time(void *priv, int value)
 static int i802_set_sta_vlan(void *priv, const u8 *addr,
                             const char *ifname, int vlan_id)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
 
        msg = nlmsg_alloc();
@@ -4187,7 +4398,7 @@ static int i802_set_sta_vlan(void *priv, const u8 *addr,
                    0, NL80211_CMD_SET_STATION, 0);
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(drv->ifname));
+                   if_nametoindex(bss->ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
        NLA_PUT_U32(msg, NL80211_ATTR_STA_VLAN,
                    if_nametoindex(ifname));
@@ -4200,18 +4411,21 @@ static int i802_set_sta_vlan(void *priv, const u8 *addr,
 
 static int i802_set_wds_sta(void *priv, const u8 *addr, int aid, int val)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
-       char name[16];
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       char name[IFNAMSIZ + 1];
 
-       os_snprintf(name, sizeof(name), "%s.sta%d", drv->ifname, aid);
+       os_snprintf(name, sizeof(name), "%s.sta%d", bss->ifname, aid);
+       wpa_printf(MSG_DEBUG, "nl80211: Set WDS STA addr=" MACSTR
+                  " aid=%d val=%d name=%s", MAC2STR(addr), aid, val, name);
        if (val) {
-               if (nl80211_create_iface(priv, name, NL80211_IFTYPE_AP_VLAN,
+               if (nl80211_create_iface(drv, name, NL80211_IFTYPE_AP_VLAN,
                                         NULL, 1) < 0)
                        return -1;
-               hostapd_set_iface_flags(drv, name, 1);
+               linux_set_iface_flags(drv->ioctl_sock, name, 1);
                return i802_set_sta_vlan(priv, addr, name, 0);
        } else {
-               i802_set_sta_vlan(priv, addr, drv->ifname, 0);
+               i802_set_sta_vlan(priv, addr, bss->ifname, 0);
                return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN,
                                                    name);
        }
@@ -4233,14 +4447,8 @@ static void handle_eapol(int sock, void *eloop_ctx, void *sock_ctx)
                return;
        }
 
-       if (have_ifidx(drv, lladdr.sll_ifindex)) {
-               union wpa_event_data event;
-               os_memset(&event, 0, sizeof(event));
-               event.eapol_rx.src = lladdr.sll_addr;
-               event.eapol_rx.data = buf;
-               event.eapol_rx.data_len = len;
-               wpa_supplicant_event(drv->ctx, EVENT_EAPOL_RX, &event);
-       }
+       if (have_ifidx(drv, lladdr.sll_ifindex))
+               drv_event_eapol_rx(drv->ctx, lladdr.sll_addr, buf, len);
 }
 
 
@@ -4269,7 +4477,7 @@ static int i802_sta_clear_stats(void *priv, const u8 *addr)
 static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
                           int reason)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
        struct ieee80211_mgmt mgmt;
 
        memset(&mgmt, 0, sizeof(mgmt));
@@ -4279,7 +4487,7 @@ static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
        memcpy(mgmt.sa, own_addr, ETH_ALEN);
        memcpy(mgmt.bssid, own_addr, ETH_ALEN);
        mgmt.u.deauth.reason_code = host_to_le16(reason);
-       return wpa_driver_nl80211_send_mlme(drv, (u8 *) &mgmt,
+       return wpa_driver_nl80211_send_mlme(bss, (u8 *) &mgmt,
                                            IEEE80211_HDRLEN +
                                            sizeof(mgmt.u.deauth));
 }
@@ -4288,7 +4496,7 @@ static int i802_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
 static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
                             int reason)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
        struct ieee80211_mgmt mgmt;
 
        memset(&mgmt, 0, sizeof(mgmt));
@@ -4298,49 +4506,126 @@ static int i802_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
        memcpy(mgmt.sa, own_addr, ETH_ALEN);
        memcpy(mgmt.bssid, own_addr, ETH_ALEN);
        mgmt.u.disassoc.reason_code = host_to_le16(reason);
-       return wpa_driver_nl80211_send_mlme(drv, (u8 *) &mgmt,
+       return wpa_driver_nl80211_send_mlme(bss, (u8 *) &mgmt,
                                            IEEE80211_HDRLEN +
                                            sizeof(mgmt.u.disassoc));
 }
 
 
+static int i802_check_bridge(struct wpa_driver_nl80211_data *drv,
+                            const char *brname, const char *ifname)
+{
+       int ifindex;
+       char in_br[IFNAMSIZ];
+
+       os_strlcpy(drv->brname, brname, IFNAMSIZ);
+       ifindex = if_nametoindex(brname);
+       if (ifindex == 0) {
+               /*
+                * Bridge was configured, but the bridge device does
+                * not exist. Try to add it now.
+                */
+               if (linux_br_add(drv->ioctl_sock, brname) < 0) {
+                       wpa_printf(MSG_ERROR, "nl80211: Failed to add the "
+                                  "bridge interface %s: %s",
+                                  brname, strerror(errno));
+                       return -1;
+               }
+               drv->added_bridge = 1;
+               add_ifidx(drv, if_nametoindex(brname));
+       }
+
+       if (linux_br_get(in_br, ifname) == 0) {
+               if (os_strcmp(in_br, brname) == 0)
+                       return 0; /* already in the bridge */
+
+               wpa_printf(MSG_DEBUG, "nl80211: Removing interface %s from "
+                          "bridge %s", ifname, in_br);
+               if (linux_br_del_if(drv->ioctl_sock, in_br, ifname) < 0) {
+                       wpa_printf(MSG_ERROR, "nl80211: Failed to "
+                                  "remove interface %s from bridge "
+                                  "%s: %s",
+                                  ifname, brname, strerror(errno));
+                       return -1;
+               }
+       }
+
+       wpa_printf(MSG_DEBUG, "nl80211: Adding interface %s into bridge %s",
+                  ifname, brname);
+       if (linux_br_add_if(drv->ioctl_sock, brname, ifname) < 0) {
+               wpa_printf(MSG_ERROR, "nl80211: Failed to add interface %s "
+                          "into bridge %s: %s",
+                          ifname, brname, strerror(errno));
+               return -1;
+       }
+       drv->added_if_into_bridge = 1;
+
+       return 0;
+}
+
+
 static void *i802_init(struct hostapd_data *hapd,
                       struct wpa_init_params *params)
 {
        struct wpa_driver_nl80211_data *drv;
+       struct i802_bss *bss;
        size_t i;
+       char brname[IFNAMSIZ];
+       int ifindex, br_ifindex;
+       int br_added = 0;
 
-       drv = wpa_driver_nl80211_init(hapd, params->ifname);
-       if (drv == NULL)
+       bss = wpa_driver_nl80211_init(hapd, params->ifname);
+       if (bss == NULL)
                return NULL;
 
-       drv->bss.ifindex = drv->ifindex;
+       drv = bss->drv;
+       if (linux_br_get(brname, params->ifname) == 0) {
+               wpa_printf(MSG_DEBUG, "nl80211: Interface %s is in bridge %s",
+                          params->ifname, brname);
+               br_ifindex = if_nametoindex(brname);
+       } else {
+               brname[0] = '\0';
+               br_ifindex = 0;
+       }
 
        drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
        drv->if_indices = drv->default_if_indices;
        for (i = 0; i < params->num_bridge; i++) {
-               if (params->bridge[i])
-                       add_ifidx(drv, if_nametoindex(params->bridge[i]));
+               if (params->bridge[i]) {
+                       ifindex = if_nametoindex(params->bridge[i]);
+                       if (ifindex)
+                               add_ifidx(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);
 
-       if (hostapd_set_iface_flags(drv, drv->ifname, 0))
+       if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 0))
                goto failed;
 
        if (params->bssid) {
-               if (set_ifhwaddr(drv, drv->ifname, params->bssid))
+               if (linux_set_ifhwaddr(drv->ioctl_sock, bss->ifname,
+                                      params->bssid))
                        goto failed;
        }
 
-       if (wpa_driver_nl80211_set_mode(drv, IEEE80211_MODE_AP)) {
+       if (wpa_driver_nl80211_set_mode(bss, IEEE80211_MODE_AP)) {
                wpa_printf(MSG_ERROR, "nl80211: Failed to set interface %s "
-                          "into AP mode", drv->ifname);
+                          "into AP mode", bss->ifname);
                goto failed;
        }
 
-       if (hostapd_set_iface_flags(drv, drv->ifname, 1))
+       if (params->num_bridge && params->bridge[0] &&
+           i802_check_bridge(drv, params->bridge[0], params->ifname) < 0)
+               goto failed;
+
+       if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 1))
                goto failed;
 
        drv->eapol_sock = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_PAE));
@@ -4355,10 +4640,10 @@ static void *i802_init(struct hostapd_data *hapd,
                goto failed;
        }
 
-       if (get_ifhwaddr(drv, drv->ifname, params->own_addr))
+       if (linux_get_ifhwaddr(drv->ioctl_sock, bss->ifname, params->own_addr))
                goto failed;
 
-       return drv;
+       return bss;
 
 failed:
        nl80211_remove_monitor_interface(drv);
@@ -4398,19 +4683,19 @@ static enum nl80211_iftype wpa_driver_nl80211_if_type(
 }
 
 
-static int wpa_driver_nl80211_if_add(const char *iface, void *priv,
-                                    enum wpa_driver_if_type type,
+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 *bss_ctx, void **drv_priv)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ifidx;
 #ifdef HOSTAPD
-       struct i802_bss *bss = NULL;
+       struct i802_bss *new_bss = NULL;
 
        if (type == WPA_IF_AP_BSS) {
-               bss = os_zalloc(sizeof(*bss));
-               if (bss == NULL)
+               new_bss = os_zalloc(sizeof(*new_bss));
+               if (new_bss == NULL)
                        return -1;
        }
 #endif /* HOSTAPD */
@@ -4420,21 +4705,25 @@ static int wpa_driver_nl80211_if_add(const char *iface, void *priv,
                                     0);
        if (ifidx < 0) {
 #ifdef HOSTAPD
-               os_free(bss);
+               os_free(new_bss);
 #endif /* HOSTAPD */
                return -1;
        }
 
 #ifdef HOSTAPD
        if (type == WPA_IF_AP_BSS) {
-               if (hostapd_set_iface_flags(priv, ifname, 1)) {
-                       nl80211_remove_iface(priv, ifidx);
-                       os_free(bss);
+               if (linux_set_iface_flags(drv->ioctl_sock, ifname, 1)) {
+                       nl80211_remove_iface(drv, ifidx);
+                       os_free(new_bss);
                        return -1;
                }
-               bss->ifindex = ifidx;
-               bss->next = drv->bss.next;
-               drv->bss.next = bss;
+               os_strlcpy(new_bss->ifname, ifname, IFNAMSIZ);
+               new_bss->ifindex = ifidx;
+               new_bss->drv = drv;
+               new_bss->next = drv->first_bss.next;
+               drv->first_bss.next = new_bss;
+               if (drv_priv)
+                       *drv_priv = new_bss;
        }
 #endif /* HOSTAPD */
 
@@ -4446,24 +4735,30 @@ static int wpa_driver_nl80211_if_remove(void *priv,
                                        enum wpa_driver_if_type type,
                                        const char *ifname)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        int ifindex = if_nametoindex(ifname);
 
+       wpa_printf(MSG_DEBUG, "nl80211: %s(type=%d ifname=%s) ifindex=%d",
+                  __func__, type, ifname, ifindex);
+       if (ifindex <= 0)
+               return -1;
        nl80211_remove_iface(drv, ifindex);
 
 #ifdef HOSTAPD
-       if (type == WPA_IF_AP_BSS) {
-               struct i802_bss *bss, *prev;
-               prev = &drv->bss;
-               bss = drv->bss.next;
-               while (bss) {
-                       if (ifindex == bss->ifindex) {
-                               prev->next = bss->next;
-                               os_free(bss);
-                               break;
-                       }
-                       prev = bss;
-                       bss = bss->next;
+       if (type != WPA_IF_AP_BSS)
+               return 0;
+
+       if (bss != &drv->first_bss) {
+               struct i802_bss *tbss = &drv->first_bss;
+
+               while (tbss) {
+                       if (tbss->next != bss)
+                               continue;
+
+                       tbss->next = bss->next;
+                       os_free(bss);
+                       break;
                }
        }
 #endif /* HOSTAPD */
@@ -4485,10 +4780,76 @@ static int cookie_handler(struct nl_msg *msg, void *arg)
 }
 
 
+static int wpa_driver_nl80211_send_action(void *priv, unsigned int freq,
+                                         const u8 *dst, const u8 *src,
+                                         const u8 *bssid,
+                                         const u8 *data, size_t data_len)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       int ret = -1;
+       struct nl_msg *msg;
+       u8 *buf;
+       struct ieee80211_hdr *hdr;
+       u64 cookie;
+
+       wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d)",
+                  drv->ifindex);
+
+       buf = os_zalloc(24 + data_len);
+       if (buf == NULL)
+               return ret;
+       os_memcpy(buf + 24, data, data_len);
+       hdr = (struct ieee80211_hdr *) buf;
+       hdr->frame_control =
+               IEEE80211_FC(WLAN_FC_TYPE_MGMT, WLAN_FC_STYPE_ACTION);
+       os_memcpy(hdr->addr1, dst, ETH_ALEN);
+       os_memcpy(hdr->addr2, src, ETH_ALEN);
+       os_memcpy(hdr->addr3, bssid, ETH_ALEN);
+
+       if (drv->nlmode == NL80211_IFTYPE_AP) {
+               ret = wpa_driver_nl80211_send_mlme(priv, buf, 24 + data_len);
+               os_free(buf);
+               return ret;
+       }
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -1;
+
+       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
+                   NL80211_CMD_ACTION, 0);
+
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
+       NLA_PUT(msg, NL80211_ATTR_FRAME, 24 + data_len, buf);
+       os_free(buf);
+
+       cookie = 0;
+       ret = send_and_recv_msgs(drv, msg, cookie_handler, &cookie);
+       msg = NULL;
+       if (ret) {
+               wpa_printf(MSG_DEBUG, "nl80211: Action command failed: ret=%d "
+                          "(%s)", ret, strerror(-ret));
+               goto nla_put_failure;
+       }
+       wpa_printf(MSG_DEBUG, "nl80211: Action TX command accepted; "
+                  "cookie 0x%llx", (long long unsigned int) cookie);
+       drv->send_action_cookie = cookie;
+       drv->pending_send_action = 1;
+       ret = 0;
+
+nla_put_failure:
+       nlmsg_free(msg);
+       return ret;
+}
+
+
 static int wpa_driver_nl80211_remain_on_channel(void *priv, unsigned int freq,
                                                unsigned int duration)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret;
        u64 cookie;
@@ -4522,7 +4883,8 @@ nla_put_failure:
 
 static int wpa_driver_nl80211_cancel_remain_on_channel(void *priv)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
        struct nl_msg *msg;
        int ret;
 
@@ -4577,7 +4939,8 @@ static void wpa_driver_nl80211_probe_req_report_timeout(void *eloop_ctx,
 
 static int wpa_driver_nl80211_probe_req_report(void *priv, int report)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
 
        if (drv->nlmode != NL80211_IFTYPE_STATION) {
                wpa_printf(MSG_DEBUG, "nl80211: probe_req_report control only "
@@ -4612,11 +4975,16 @@ static int wpa_driver_nl80211_probe_req_report(void *priv, int report)
 }
 
 
-static int wpa_driver_nl80211_alloc_interface_addr(void *priv, u8 *addr)
+static int wpa_driver_nl80211_alloc_interface_addr(void *priv, u8 *addr,
+                                                  char *ifname)
 {
-       struct wpa_driver_nl80211_data *drv = priv;
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+
+       if (ifname)
+               ifname[0] = '\0';
 
-       if (get_ifhwaddr(drv, drv->ifname, addr) < 0)
+       if (linux_get_ifhwaddr(drv->ioctl_sock, bss->ifname, addr) < 0)
                return -1;
 
        if (addr[0] & 0x02) {
@@ -4636,6 +5004,85 @@ static void wpa_driver_nl80211_release_interface_addr(void *priv,
 }
 
 
+static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
+                                    int ifindex, int disabled)
+{
+       struct nl_msg *msg;
+       struct nlattr *bands, *band;
+       int ret;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -1;
+
+       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
+                   NL80211_CMD_SET_TX_BITRATE_MASK, 0);
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
+
+       bands = nla_nest_start(msg, NL80211_ATTR_TX_RATES);
+       if (!bands)
+               goto nla_put_failure;
+
+       /*
+        * Disable 2 GHz rates 1, 2, 5.5, 11 Mbps by masking out everything
+        * else apart from 6, 9, 12, 18, 24, 36, 48, 54 Mbps from non-MCS
+        * rates. All 5 GHz rates are left enabled.
+        */
+       band = nla_nest_start(msg, NL80211_BAND_2GHZ);
+       if (!band)
+               goto nla_put_failure;
+       NLA_PUT(msg, NL80211_TXRATE_LEGACY, 8,
+               "\x0c\x12\x18\x24\x30\x48\x60\x6c");
+       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));
+       }
+
+       return ret;
+
+nla_put_failure:
+       nlmsg_free(msg);
+       return -1;
+}
+
+
+static int wpa_driver_nl80211_disable_11b_rates(void *priv, int disabled)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       drv->disable_11b_rates = disabled;
+       return nl80211_disable_11b_rates(drv, drv->ifindex, disabled);
+}
+
+
+static int wpa_driver_nl80211_deinit_ap(void *priv)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       if (drv->nlmode != NL80211_IFTYPE_AP)
+               return -1;
+       wpa_driver_nl80211_del_beacon(drv);
+       return wpa_driver_nl80211_set_mode(priv, IEEE80211_MODE_INFRA);
+}
+
+
+static void wpa_driver_nl80211_resume(void *priv)
+{
+       struct i802_bss *bss = priv;
+       struct wpa_driver_nl80211_data *drv = bss->drv;
+       if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 1)) {
+               wpa_printf(MSG_DEBUG, "nl80211: Failed to set interface up on "
+                          "resume event");
+       }
+}
+
+
 const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .name = "nl80211",
        .desc = "Linux nl80211/cfg80211",
@@ -4684,10 +5131,14 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .set_sta_vlan = i802_set_sta_vlan,
        .set_wds_sta = i802_set_wds_sta,
 #endif /* HOSTAPD */
+       .send_action = wpa_driver_nl80211_send_action,
        .remain_on_channel = wpa_driver_nl80211_remain_on_channel,
        .cancel_remain_on_channel =
        wpa_driver_nl80211_cancel_remain_on_channel,
        .probe_req_report = wpa_driver_nl80211_probe_req_report,
        .alloc_interface_addr = wpa_driver_nl80211_alloc_interface_addr,
        .release_interface_addr = wpa_driver_nl80211_release_interface_addr,
+       .disable_11b_rates = wpa_driver_nl80211_disable_11b_rates,
+       .deinit_ap = wpa_driver_nl80211_deinit_ap,
+       .resume = wpa_driver_nl80211_resume,
 };