driver_nl80211: Remove set_ssid from nl80211 driver
[libeap.git] / hostapd / driver_nl80211.c
index 152f615..dedc8e8 100644 (file)
@@ -27,7 +27,7 @@
 #include <net/if.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>   /* The L2 protocols */
-#include <linux/wireless.h>
+#include "wireless_copy.h"
 #include <net/if_arp.h>
 
 #include "hostapd.h"
@@ -135,15 +135,62 @@ static int have_ifidx(struct i802_driver_data *drv, int ifidx)
 }
 
 
-/* helper for netlink get routines */
-static int ack_wait_handler(struct nl_msg *msg, void *arg)
+/* nl80211 code */
+static int ack_handler(struct nl_msg *msg, void *arg)
 {
-       int *finished = arg;
-
-       *finished = 1;
+       int *err = arg;
+       *err = 0;
        return NL_STOP;
 }
 
+static int finish_handler(struct nl_msg *msg, void *arg)
+{
+       int *ret = arg;
+       *ret = 0;
+       return NL_SKIP;
+}
+
+static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
+                        void *arg)
+{
+       int *ret = arg;
+       *ret = err->error;
+       return NL_SKIP;
+}
+
+static int send_and_recv_msgs(struct i802_driver_data *drv,
+                             struct nl_msg *msg,
+                             int (*valid_handler)(struct nl_msg *, void *),
+                             void *valid_data)
+{
+       struct nl_cb *cb;
+       int err = -ENOMEM;
+
+       cb = nl_cb_clone(drv->nl_cb);
+       if (!cb)
+               goto out;
+
+       err = nl_send_auto_complete(drv->nl_handle, msg);
+       if (err < 0)
+               goto out;
+
+       err = 1;
+
+       nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
+       nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
+       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
+
+       if (valid_handler)
+               nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM,
+                         valid_handler, valid_data);
+
+       while (err > 0)
+               nl_recvmsgs(drv->nl_handle, cb);
+ out:
+       nl_cb_put(cb);
+       nlmsg_free(msg);
+       return err;
+}
 
 static int hostapd_set_iface_flags(struct i802_driver_data *drv,
                                   const char *ifname, int dev_up)
@@ -177,18 +224,16 @@ static int hostapd_set_iface_flags(struct i802_driver_data *drv,
 }
 
 
-static int i802_set_encryption(const char *iface, void *priv, const char *alg,
-                              const u8 *addr, int idx, const u8 *key,
-                              size_t key_len, int txkey)
+static int nl_set_encr(int ifindex, struct i802_driver_data *drv,
+                      const char *alg, const u8 *addr, int idx, const u8 *key,
+                      size_t key_len, int txkey)
 {
-       struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
-       int err = 0;
+       int ret;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        if (strcmp(alg, "none") == 0) {
                genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
@@ -208,57 +253,75 @@ static int i802_set_encryption(const char *iface, void *priv, const char *alg,
                        NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER, 0x000FAC02);
                else if (strcmp(alg, "CCMP") == 0)
                        NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER, 0x000FAC04);
-               else
-                       goto out;
+               else if (strcmp(alg, "IGTK") == 0)
+                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER, 0x000FAC06);
+               else {
+                       wpa_printf(MSG_ERROR, "%s: Unsupported encryption "
+                                  "algorithm '%s'", __func__, alg);
+                       nlmsg_free(msg);
+                       return -1;
+               }
        }
 
        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));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           (err = nl_wait_for_ack(drv->nl_handle)) < 0) {
-               if (err != -ENOENT) {
-                       err = 0;
-                       goto out;
-               }
-       }
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret == -ENOENT)
+               ret = 0;
 
        /*
-        * If we need to set the default TX key we do that below,
-        * otherwise we're done here.
+        * If we failed or don't need to set the default TX key (below),
+        * we're done here.
         */
-       if (!txkey || addr) {
-               ret = 0;
-               goto out;
-       }
-
-       nlmsg_free(msg);
+       if (ret || !txkey || addr)
+               return ret;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_KEY, 0);
        NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, idx);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(iface));
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
+#ifdef NL80211_MFP_PENDING
+       if (strcmp(alg, "IGTK") == 0)
+               NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT_MGMT);
+       else
+               NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT);
+#else /* NL80211_MFP_PENDING */
        NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT);
+#endif /* NL80211_MFP_PENDING */
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           (err = nl_wait_for_ack(drv->nl_handle)) < 0) {
-               if (err != -ENOENT) {
-                       err = 0;
-                       goto out;
-               }
-       }
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret == -ENOENT)
+               ret = 0;
+       return ret;
+ nla_put_failure:
+       return -ENOBUFS;
+}
 
-       ret = 0;
 
- out:
- nla_put_failure:
-       nlmsg_free(msg);
+static int i802_set_encryption(const char *iface, void *priv, const char *alg,
+                              const u8 *addr, int idx, const u8 *key,
+                              size_t key_len, int txkey)
+{
+       struct i802_driver_data *drv = priv;
+       int ret;
+
+       ret = nl_set_encr(if_nametoindex(iface), drv, alg, addr, idx, key,
+                         key_len, txkey);
+       if (ret < 0)
+               return ret;
+
+       if (strcmp(alg, "IGTK") == 0) {
+               ret = nl_set_encr(drv->monitor_ifidx, drv, alg, addr, idx, key,
+                                 key_len, txkey);
+       }
+
        return ret;
 }
 
@@ -273,7 +336,7 @@ static inline int min_int(int a, int b)
 
 static int get_key_handler(struct nl_msg *msg, void *arg)
 {
-       struct nlattr *tb[NL80211_ATTR_MAX];
+       struct nlattr *tb[NL80211_ATTR_MAX + 1];
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
@@ -297,14 +360,10 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err = 0;
-       int finished = 0;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_GET_KEY, 0);
@@ -314,74 +373,56 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
        NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, idx);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(iface));
 
-       cb = nl_cb_clone(drv->nl_cb);
-       if (!cb)
-               goto out;
-
        memset(seq, 0, 6);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, get_key_handler, seq);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_wait_handler, &finished);
-
-       err = nl_recvmsgs(drv->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(drv->nl_handle);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
+       return send_and_recv_msgs(drv, msg, get_key_handler, seq);
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
 }
 
 
 static int i802_set_rate_sets(void *priv, int *supp_rates, int *basic_rates,
                              int mode)
 {
-       return -1;
-}
+#ifdef NL80211_ATTR_BSS_BASIC_RATES
+       struct i802_driver_data *drv = priv;
+       struct nl_msg *msg;
+       u8 rates[NL80211_MAX_SUPP_RATES];
+       u8 rates_len = 0;
+       int i;
 
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -ENOMEM;
 
-static int i802_set_ssid(const char *ifname, void *priv, const u8 *buf,
-                        int len)
-{
-       struct i802_driver_data *drv = priv;
-       struct iwreq iwr;
+       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
+                   NL80211_CMD_SET_BSS, 0);
 
-       memset(&iwr, 0, sizeof(iwr));
-       os_strlcpy(iwr.ifr_name, ifname, IFNAMSIZ);
-       iwr.u.essid.flags = 1; /* SSID active */
-       iwr.u.essid.pointer = (caddr_t) buf;
-       iwr.u.essid.length = len;
+       for (i = 0; i < NL80211_MAX_SUPP_RATES && basic_rates[i] >= 0; i++)
+               rates[rates_len++] = basic_rates[i] / 5;
 
-       if (ioctl(drv->ioctl_sock, SIOCSIWESSID, &iwr) < 0) {
-               perror("ioctl[SIOCSIWESSID]");
-               printf("len=%d\n", len);
-               return -1;
-       }
+       NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, rates_len, rates);
 
-       return 0;
+       /* TODO: multi-BSS support */
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
+
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
+ nla_put_failure:
+       return -ENOBUFS;
+#else /* NL80211_ATTR_BSS_BASIC_RATES */
+       return -1;
+#endif /* NL80211_ATTR_BSS_BASIC_RATES */
 }
 
 
-static int i802_send_mgmt_frame(void *priv, const void *data, size_t len,
-                               int flags)
+static int i802_send_frame(void *priv, const void *data, size_t len,
+                          int encrypt, int flags)
 {
-       struct ieee80211_hdr *hdr = (void*) data;
        __u8 rtap_hdr[] = {
                0x00, 0x00, /* radiotap version */
                0x0e, 0x00, /* radiotap length */
                0x02, 0xc0, 0x00, 0x00, /* bmap: flags, tx and rx flags */
-               0x0c,       /* F_WEP | F_FRAG (encrypt/fragment if required) */
+               IEEE80211_RADIOTAP_F_FRAG, /* F_FRAG (fragment if required) */
                0x00,       /* padding */
                0x00, 0x00, /* RX and TX flags to indicate that */
                0x00, 0x00, /* this is the injected frame directly */
@@ -407,14 +448,17 @@ static int i802_send_mgmt_frame(void *priv, const void *data, size_t len,
                .msg_flags = 0,
        };
 
-       /*
-        * ugh, guess what, the generic code sets one of the version
-        * bits to request tx callback
-        */
-       hdr->frame_control &= ~host_to_le16(BIT(1));
+       if (encrypt)
+               rtap_hdr[8] |= IEEE80211_RADIOTAP_F_WEP;
+
        return sendmsg(drv->monitor_sock, &msg, flags);
 }
 
+static int i802_send_mgmt_frame(void *priv, const void *data, size_t len,
+                               int flags)
+{
+       return i802_send_frame(priv, data, len, 1, flags);
+}
 
 /* Set kernel driver on given frequency (MHz) */
 static int i802_set_freq(void *priv, int mode, int freq)
@@ -568,11 +612,10 @@ static int i802_flush(void *priv)
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -1;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_DEL_STATION, 0);
@@ -583,18 +626,9 @@ static int i802_flush(void *priv)
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
                    if_nametoindex(drv->iface));
 
-       ret = 0;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0) {
-               ret = -1;
-       }
-
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
-       nlmsg_free(msg);
-
- out:
-       return ret;
+       return -ENOBUFS;
 }
 
 
@@ -646,14 +680,10 @@ static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err = 0;
-       int finished = 0;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_GET_STATION, 0);
@@ -661,32 +691,9 @@ static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
 
-       cb = nl_cb_clone(drv->nl_cb);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, get_sta_handler, data);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_wait_handler, &finished);
-
-       err = nl_recvmsgs(drv->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(drv->nl_handle);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
+       return send_and_recv_msgs(drv, msg, get_sta_handler, data);
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-
+       return -ENOBUFS;
 }
 
 
@@ -745,7 +752,7 @@ static int i802_send_eapol(void *priv, const u8 *addr, const u8 *data,
        pos += 2;
        memcpy(pos, data, data_len);
 
-       res = i802_send_mgmt_frame(drv, (u8 *) hdr, len, 0);
+       res = i802_send_frame(drv, (u8 *) hdr, len, encrypt, 0);
        free(hdr);
 
        if (res < 0) {
@@ -758,42 +765,43 @@ static int i802_send_eapol(void *priv, const u8 *addr, const u8 *data,
 }
 
 
-static int i802_sta_add(const char *ifname, void *priv, const u8 *addr,
-                       u16 aid, u16 capability, u8 *supp_rates,
-                       size_t supp_rates_len, int flags, u16 listen_interval)
+static int i802_sta_add2(const char *ifname, void *priv,
+                        struct hostapd_sta_add_params *params)
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
+       int ret = -ENOBUFS;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        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(drv->iface));
-       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
-       NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, aid);
-       NLA_PUT(msg, NL80211_ATTR_STA_SUPPORTED_RATES, supp_rates_len,
-               supp_rates);
-       NLA_PUT_U16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL, listen_interval);
-
-       ret = nl_send_auto_complete(drv->nl_handle, msg);
-       if (ret < 0)
-               goto nla_put_failure;
-
-       ret = nl_wait_for_ack(drv->nl_handle);
-       /* ignore EEXIST, this happens if a STA associates while associated */
-       if (ret == -EEXIST || ret >= 0)
+       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,
+               params->supp_rates);
+       NLA_PUT_U16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL,
+                   params->listen_interval);
+
+#ifdef CONFIG_IEEE80211N
+#ifdef NL80211_ATTR_HT_CAPABILITY
+       if (params->ht_capabilities) {
+               NLA_PUT(msg, NL80211_ATTR_HT_CAPABILITY,
+                       params->ht_capabilities->length,
+                       &params->ht_capabilities->data);
+       }
+#endif /* NL80211_ATTR_HT_CAPABILITY */
+#endif /* CONFIG_IEEE80211N */
+
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret == -EEXIST)
                ret = 0;
-
  nla_put_failure:
-       nlmsg_free(msg);
-
- out:
        return ret;
 }
 
@@ -802,11 +810,11 @@ static int i802_sta_remove(void *priv, const u8 *addr)
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
+       int ret;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_DEL_STATION, 0);
@@ -815,18 +823,12 @@ static int i802_sta_remove(void *priv, const u8 *addr)
                    if_nametoindex(drv->iface));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
 
-       ret = 0;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0) {
-               ret = -1;
-       }
-
- nla_put_failure:
-       nlmsg_free(msg);
-
- out:
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret == -ENOENT)
+               return 0;
        return ret;
+ nla_put_failure:
+       return -ENOBUFS;
 }
 
 
@@ -835,15 +837,16 @@ static int i802_sta_set_flags(void *priv, const u8 *addr,
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg, *flags = NULL;
-       int ret = -1;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        flags = nlmsg_alloc();
-       if (!flags)
-               goto free_msg;
+       if (!flags) {
+               nlmsg_free(msg);
+               return -ENOMEM;
+       }
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_STATION, 0);
@@ -861,24 +864,20 @@ static int i802_sta_set_flags(void *priv, const u8 *addr,
        if (total_flags & WLAN_STA_SHORT_PREAMBLE)
                NLA_PUT_FLAG(flags, NL80211_STA_FLAG_SHORT_PREAMBLE);
 
+#ifdef NL80211_MFP_PENDING
+       if (total_flags & WLAN_STA_MFP)
+               NLA_PUT_FLAG(flags, NL80211_STA_FLAG_MFP);
+#endif /* NL80211_MFP_PENDING */
+
        if (nla_put_nested(msg, NL80211_ATTR_STA_FLAGS, flags))
                goto nla_put_failure;
 
-       ret = 0;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0) {
-               ret = -1;
-       }
-
- nla_put_failure:
        nlmsg_free(flags);
 
- free_msg:
-       nlmsg_free(msg);
-
- out:
-       return ret;
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
+ nla_put_failure:
+       nlmsg_free(flags);
+       return -ENOBUFS;
 }
 
 
@@ -899,7 +898,48 @@ static int i802_set_regulatory_domain(void *priv, unsigned int rd)
 static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
                                    int cw_min, int cw_max, int burst_time)
 {
+#ifdef NL80211_ATTR_WIPHY_TXQ_PARAMS
+       struct i802_driver_data *drv = priv;
+       struct nl_msg *msg;
+       struct nlattr *txq, *params;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -1;
+
+       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->iface));
+
+       txq = nla_nest_start(msg, NL80211_ATTR_WIPHY_TXQ_PARAMS);
+       if (!txq)
+               goto nla_put_failure;
+
+       /* We are only sending parameters for a single TXQ at a time */
+       params = nla_nest_start(msg, 1);
+       if (!params)
+               goto nla_put_failure;
+
+       NLA_PUT_U8(msg, NL80211_TXQ_ATTR_QUEUE, queue);
+       /* 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);
+
+       nla_nest_end(msg, params);
+
+       nla_nest_end(msg, txq);
+
+       if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
+               return 0;
+ nla_put_failure:
+       return -1;
+#else /* NL80211_ATTR_WIPHY_TXQ_PARAMS */
        return -1;
+#endif /* NL80211_ATTR_WIPHY_TXQ_PARAMS */
 }
 
 
@@ -917,11 +957,11 @@ static void nl80211_remove_iface(struct i802_driver_data *drv, int ifidx)
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_DEL_INTERFACE, 0);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifidx);
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0)
-       nla_put_failure:
-               printf("Failed to remove interface.\n");
-       nlmsg_free(msg);
+
+       if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
+               return;
+ nla_put_failure:
+       printf("Failed to remove interface.\n");
 }
 
 
@@ -934,6 +974,7 @@ static int nl80211_create_iface(struct i802_driver_data *drv,
        int ifidx;
        struct ifreq ifreq;
        struct iwreq iwr;
+       int ret = -ENOBUFS;
 
        msg = nlmsg_alloc();
        if (!msg)
@@ -963,16 +1004,13 @@ static int nl80211_create_iface(struct i802_driver_data *drv,
                        goto nla_put_failure;
        }
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0) {
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (ret) {
  nla_put_failure:
                printf("Failed to create interface %s.\n", ifname);
-               nlmsg_free(msg);
-               return -1;
+               return ret;
        }
 
-       nlmsg_free(msg);
-
        ifidx = if_nametoindex(ifname);
 
        if (ifidx <= 0)
@@ -1047,11 +1085,11 @@ static int i802_set_beacon(const char *iface, void *priv,
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
        u8 cmd = NL80211_CMD_NEW_BEACON;
-       int ret = -1;
+       int ret;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        if (drv->beacon_set)
                cmd = NL80211_CMD_SET_BEACON;
@@ -1067,44 +1105,30 @@ static int i802_set_beacon(const char *iface, void *priv,
                drv->dtim_period = 2;
        NLA_PUT_U32(msg, NL80211_ATTR_DTIM_PERIOD, drv->dtim_period);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0)
-               goto out;
-
-       ret = 0;
-
-       drv->beacon_set = 1;
-
- out:
- nla_put_failure:
-       nlmsg_free(msg);
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (!ret)
+               drv->beacon_set = 1;
        return ret;
+ nla_put_failure:
+       return -ENOBUFS;
 }
 
 
 static int i802_del_beacon(struct i802_driver_data *drv)
 {
        struct nl_msg *msg;
-       int ret = -1;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_DEL_BEACON, 0);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0)
-               goto out;
-
-       ret = 0;
-
- out:
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
 }
 
 
@@ -1148,13 +1172,15 @@ static int i802_set_beacon_int(void *priv, int value)
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
 
        drv->beacon_int = value;
 
+       if (!drv->beacon_set)
+               return 0;
+
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_BEACON, 0);
@@ -1162,16 +1188,9 @@ static int i802_set_beacon_int(void *priv, int value)
 
        NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, value);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0)
-               goto out;
-
-       ret = 0;
-
- out:
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
 }
 
 
@@ -1179,11 +1198,10 @@ static int i802_set_dtim_period(const char *iface, void *priv, int value)
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_BEACON, 0);
@@ -1192,34 +1210,59 @@ static int i802_set_dtim_period(const char *iface, void *priv, int value)
        drv->dtim_period = value;
        NLA_PUT_U32(msg, NL80211_ATTR_DTIM_PERIOD, drv->dtim_period);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0)
-               goto out;
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
+ nla_put_failure:
+       return -ENOBUFS;
+}
 
-       ret = 0;
 
- out:
+static int i802_set_bss(void *priv, int cts, int preamble, int slot)
+{
+#ifdef NL80211_CMD_SET_BSS
+       struct i802_driver_data *drv = priv;
+       struct nl_msg *msg;
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               return -ENOMEM;
+
+       genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, 0,
+                   NL80211_CMD_SET_BSS, 0);
+
+       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);
+
+       /* TODO: multi-BSS support */
+       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
+
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
+#else /* NL80211_CMD_SET_BSS */
+       return -1;
+#endif /* NL80211_CMD_SET_BSS */
 }
 
 
 static int i802_set_cts_protect(void *priv, int value)
 {
-       return -1;
+       return i802_set_bss(priv, value, -1, -1);
 }
 
 
 static int i802_set_preamble(void *priv, int value)
 {
-       return -1;
+       return i802_set_bss(priv, -1, value, -1);
 }
 
 
 static int i802_set_short_slot_time(void *priv, int value)
 {
-       return -1;
+       return i802_set_bss(priv, -1, -1, value);
 }
 
 
@@ -1264,7 +1307,6 @@ static int i802_if_remove(void *priv, enum hostapd_driver_if_type type,
 struct phy_info_arg {
        u16 *num_modes;
        struct hostapd_hw_modes *modes;
-       int error;
 };
 
 static int phy_info_handler(struct nl_msg *msg, void *arg)
@@ -1403,8 +1445,6 @@ static int phy_info_handler(struct nl_msg *msg, void *arg)
                }
        }
 
-       phy_info->error = 0;
-
        return NL_SKIP;
 }
 
@@ -1414,13 +1454,9 @@ static struct hostapd_hw_modes *i802_get_hw_feature_data(void *priv,
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int err = -1;
-       struct nl_cb *cb = NULL;
-       int finished = 0;
        struct phy_info_arg result = {
                .num_modes = num_modes,
                .modes = NULL,
-               .error = 1,
        };
 
        *num_modes = 0;
@@ -1435,33 +1471,10 @@ static struct hostapd_hw_modes *i802_get_hw_feature_data(void *priv,
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
 
-       cb = nl_cb_clone(drv->nl_cb);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, phy_info_handler, &result);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_wait_handler, &finished);
-
-       err = nl_recvmsgs(drv->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(drv->nl_handle);
-
-       if (err < 0 || result.error) {
-               hostapd_free_hw_features(result.modes, *num_modes);
-               result.modes = NULL;
-       }
-
- out:
-       nl_cb_put(cb);
+       if (send_and_recv_msgs(drv, msg, phy_info_handler, &result) == 0)
+               return result.modes;
  nla_put_failure:
-       if (err)
-               fprintf(stderr, "failed to get information: %d\n", err);
-       nlmsg_free(msg);
-       return result.modes;
+       return NULL;
 }
 
 
@@ -1470,11 +1483,10 @@ static int i802_set_sta_vlan(void *priv, const u8 *addr,
 {
        struct i802_driver_data *drv = priv;
        struct nl_msg *msg;
-       int ret = -1;
 
        msg = nlmsg_alloc();
        if (!msg)
-               goto out;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_STATION, 0);
@@ -1485,18 +1497,9 @@ static int i802_set_sta_vlan(void *priv, const u8 *addr,
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
                    if_nametoindex(ifname));
 
-       ret = 0;
-
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           (errno = nl_wait_for_ack(drv->nl_handle) < 0)) {
-               ret = -1;
-       }
-
+       return send_and_recv_msgs(drv, msg, NULL, NULL);
  nla_put_failure:
-       nlmsg_free(msg);
-
- out:
-       return ret;
+       return -ENOBUFS;
 }
 
 
@@ -1837,10 +1840,11 @@ static int nl80211_set_master_mode(struct i802_driver_data *drv,
                                   const char *ifname)
 {
        struct nl_msg *msg;
+       int ret = -ENOBUFS;
 
        msg = nlmsg_alloc();
        if (!msg)
-               return -1;
+               return -ENOMEM;
 
        genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                    0, NL80211_CMD_SET_INTERFACE, 0);
@@ -1848,20 +1852,15 @@ static int nl80211_set_master_mode(struct i802_driver_data *drv,
                    if_nametoindex(ifname));
        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_AP);
 
-       if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
-           nl_wait_for_ack(drv->nl_handle) < 0) {
+       ret = send_and_recv_msgs(drv, msg, NULL, NULL);
+       if (!ret)
+               return 0;
  nla_put_failure:
-               wpa_printf(MSG_ERROR, "Failed to set interface %s to master "
-                          "mode.", ifname);
-               nlmsg_free(msg);
-               return -1;
-       }
-
-       nlmsg_free(msg);
-
-       return 0;
+       wpa_printf(MSG_ERROR, "Failed to set interface %s to master "
+                  "mode.", ifname);
+       return ret;
 }
-  
+
 
 static int i802_init_sockets(struct i802_driver_data *drv, const u8 *bssid)
 {
@@ -1953,12 +1952,12 @@ static int i802_init_sockets(struct i802_driver_data *drv, const u8 *bssid)
                return -1;
        }
 
-        memset(&ifr, 0, sizeof(ifr));
-        os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
-        if (ioctl(drv->ioctl_sock, SIOCGIFHWADDR, &ifr) != 0) {
+       memset(&ifr, 0, sizeof(ifr));
+       os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
+       if (ioctl(drv->ioctl_sock, SIOCGIFHWADDR, &ifr) != 0) {
                perror("ioctl(SIOCGIFHWADDR)");
                return -1;
-        }
+       }
 
        if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
                printf("Invalid HW-addr family 0x%04x\n",
@@ -2364,9 +2363,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .sta_deauth = i802_sta_deauth,
        .sta_disassoc = i802_sta_disassoc,
        .sta_remove = i802_sta_remove,
-       .set_ssid = i802_set_ssid,
        .send_mgmt_frame = i802_send_mgmt_frame,
-       .sta_add = i802_sta_add,
+       .sta_add2 = i802_sta_add2,
        .get_inact_sec = i802_get_inact_sec,
        .sta_clear_stats = i802_sta_clear_stats,
        .set_freq = i802_set_freq,