bsd: Fix hostapd compiler warning
[mech_eap.git] / src / drivers / driver_bsd.c
index 663800e..ca64d5c 100644 (file)
@@ -3,23 +3,19 @@
  * Copyright (c) 2004, Sam Leffler <sam@errno.com>
  * Copyright (c) 2004, 2Wire, Inc
  *
- * 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
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
 #include <sys/ioctl.h>
+#include <sys/sysctl.h>
 
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
 #include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
 
 #include <net/if.h>
 #include <net/if_media.h>
 #include <netproto/802_11/ieee80211_ioctl.h>
 #include <netproto/802_11/ieee80211_dragonfly.h>
 #else /* __DragonFly__ */
+#ifdef __GLIBC__
+#include <netinet/ether.h>
+#endif /* __GLIBC__ */
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <net80211/ieee80211_crypto.h>
-#endif /* __DragonFly__ */
-#if __FreeBSD__
+#endif /* __DragonFly__ || __GLIBC__ */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <net80211/ieee80211_freebsd.h>
 #endif
 #if __NetBSD__
 #include <net80211/ieee80211_netbsd.h>
 #endif
 
+#include "l2_packet/l2_packet.h"
+
+struct bsd_driver_data {
+       struct hostapd_data *hapd;      /* back pointer */
+
+       int     sock;                   /* open socket for 802.11 ioctls */
+       struct l2_packet_data *sock_xmit;/* raw packet xmit socket */
+       int     route;                  /* routing socket for events */
+       char    ifname[IFNAMSIZ+1];     /* interface name */
+       unsigned int ifindex;           /* interface index */
+       void    *ctx;
+       struct wpa_driver_capa capa;    /* driver capability */
+       int     is_ap;                  /* Access point mode */
+       int     prev_roaming;   /* roaming state to restore on deinit */
+       int     prev_privacy;   /* privacy state to restore on deinit */
+       int     prev_wpa;       /* wpa state to restore on deinit */
+       enum ieee80211_opmode opmode;   /* operation mode */
+       char    *event_buf;
+       size_t  event_buf_len;
+};
+
 /* Generic functions for hostapd and wpa_supplicant */
 
 static int
-bsd_set80211var(int s, const char *ifname, int op, const void *arg, int arg_len)
+bsd_set80211(void *priv, int op, int val, const void *arg, int arg_len)
 {
+       struct bsd_driver_data *drv = priv;
        struct ieee80211req ireq;
 
        os_memset(&ireq, 0, sizeof(ireq));
-       os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name));
+       os_strlcpy(ireq.i_name, drv->ifname, sizeof(ireq.i_name));
        ireq.i_type = op;
-       ireq.i_len = arg_len;
+       ireq.i_val = val;
        ireq.i_data = (void *) arg;
+       ireq.i_len = arg_len;
 
-       if (ioctl(s, SIOCS80211, &ireq) < 0) {
-               fprintf(stderr, "ioctl[SIOCS80211, op %u, len %u]: %s\n",
-                       op, arg_len, strerror(errno));
+       if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) {
+               wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, val=%u, "
+                          "arg_len=%u]: %s", op, val, arg_len,
+                          strerror(errno));
                return -1;
        }
        return 0;
 }
 
 static int
-bsd_get80211var(int s, const char *ifname, int op, void *arg, int arg_len)
+bsd_get80211(void *priv, struct ieee80211req *ireq, int op, void *arg,
+            int arg_len)
 {
-       struct ieee80211req ireq;
+       struct bsd_driver_data *drv = priv;
 
-       os_memset(&ireq, 0, sizeof(ireq));
-       os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name));
-       ireq.i_type = op;
-       ireq.i_len = arg_len;
-       ireq.i_data = arg;
+       os_memset(ireq, 0, sizeof(*ireq));
+       os_strlcpy(ireq->i_name, drv->ifname, sizeof(ireq->i_name));
+       ireq->i_type = op;
+       ireq->i_len = arg_len;
+       ireq->i_data = arg;
 
-       if (ioctl(s, SIOCG80211, &ireq) < 0) {
-               fprintf(stderr, "ioctl[SIOCG80211, op %u, len %u]: %s\n",
-                       op, arg_len, strerror(errno));
+       if (ioctl(drv->sock, SIOCG80211, ireq) < 0) {
+               wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, "
+                          "arg_len=%u]: %s", op, arg_len, strerror(errno));
                return -1;
        }
-       return ireq.i_len;
+       return 0;
 }
 
 static int
-bsd_set80211param(int s, const char *ifname, int op, int arg)
+get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len)
 {
        struct ieee80211req ireq;
 
-       os_memset(&ireq, 0, sizeof(ireq));
-       os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name));
-       ireq.i_type = op;
-       ireq.i_val = arg;
-
-       if (ioctl(s, SIOCS80211, &ireq) < 0) {
-               fprintf(stderr, "ioctl[SIOCS80211, op %u, arg 0x%x]: %s\n",
-                       op, arg, strerror(errno));
+       if (bsd_get80211(drv, &ireq, op, arg, arg_len) < 0)
                return -1;
-       }
-       return 0;
+       return ireq.i_len;
 }
 
 static int
-bsd_get_ssid(int s, const char *ifname, u8 *ssid)
+set80211var(struct bsd_driver_data *drv, int op, const void *arg, int arg_len)
 {
+       return bsd_set80211(drv, op, 0, arg, arg_len);
+}
+
+static int
+set80211param(struct bsd_driver_data *drv, int op, int arg)
+{
+       return bsd_set80211(drv, op, arg, NULL, 0);
+}
+
+static int
+bsd_get_ssid(void *priv, u8 *ssid, int len)
+{
+       struct bsd_driver_data *drv = priv;
 #ifdef SIOCG80211NWID
        struct ieee80211_nwid nwid;
        struct ifreq ifr;
 
        os_memset(&ifr, 0, sizeof(ifr));
-       os_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
        ifr.ifr_data = (void *)&nwid;
-       if (ioctl(s, SIOCG80211NWID, &ifr) < 0 ||
+       if (ioctl(drv->sock, SIOCG80211NWID, &ifr) < 0 ||
            nwid.i_len > IEEE80211_NWID_LEN)
                return -1;
        os_memcpy(ssid, nwid.i_nwid, nwid.i_len);
        return nwid.i_len;
 #else
-       return bsd_get80211var(s, ifname, IEEE80211_IOC_SSID,
-               ssid, IEEE80211_NWID_LEN);
+       return get80211var(drv, IEEE80211_IOC_SSID, ssid, IEEE80211_NWID_LEN);
 #endif
 }
 
 static int
-bsd_set_ssid(int s, const char *ifname, const u8 *ssid, size_t ssid_len)
+bsd_set_ssid(void *priv, const u8 *ssid, int ssid_len)
 {
+       struct bsd_driver_data *drv = priv;
 #ifdef SIOCS80211NWID
        struct ieee80211_nwid nwid;
        struct ifreq ifr;
@@ -135,23 +164,24 @@ bsd_set_ssid(int s, const char *ifname, const u8 *ssid, size_t ssid_len)
        os_memcpy(nwid.i_nwid, ssid, ssid_len);
        nwid.i_len = ssid_len;
        os_memset(&ifr, 0, sizeof(ifr));
-       os_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
        ifr.ifr_data = (void *)&nwid;
-       return ioctl(s, SIOCS80211NWID, &ifr);
+       return ioctl(drv->sock, SIOCS80211NWID, &ifr);
 #else
-       return bsd_set80211var(s, ifname, IEEE80211_IOC_SSID, ssid, ssid_len);
+       return set80211var(drv, IEEE80211_IOC_SSID, ssid, ssid_len);
 #endif
 }
 
 static int
-bsd_get_if_media(int s, const char *ifname)
+bsd_get_if_media(void *priv)
 {
+       struct bsd_driver_data *drv = priv;
        struct ifmediareq ifmr;
 
        os_memset(&ifmr, 0, sizeof(ifmr));
-       os_strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
+       os_strlcpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name));
 
-       if (ioctl(s, SIOCGIFMEDIA, &ifmr) < 0) {
+       if (ioctl(drv->sock, SIOCGIFMEDIA, &ifmr) < 0) {
                wpa_printf(MSG_ERROR, "%s: SIOCGIFMEDIA %s", __func__,
                           strerror(errno));
                return -1;
@@ -161,15 +191,16 @@ bsd_get_if_media(int s, const char *ifname)
 }
 
 static int
-bsd_set_if_media(int s, const char *ifname, int media)
+bsd_set_if_media(void *priv, int media)
 {
+       struct bsd_driver_data *drv = priv;
        struct ifreq ifr;
 
        os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
        ifr.ifr_media = media;
 
-       if (ioctl(s, SIOCSIFMEDIA, &ifr) < 0) {
+       if (ioctl(drv->sock, SIOCSIFMEDIA, &ifr) < 0) {
                wpa_printf(MSG_ERROR, "%s: SIOCSIFMEDIA %s", __func__,
                           strerror(errno));
                return -1;
@@ -179,21 +210,21 @@ bsd_set_if_media(int s, const char *ifname, int media)
 }
 
 static int
-bsd_set_mediaopt(int s, const char *ifname, uint32_t mask, uint32_t mode)
+bsd_set_mediaopt(void *priv, uint32_t mask, uint32_t mode)
 {
-       int media = bsd_get_if_media(s, ifname);
+       int media = bsd_get_if_media(priv);
 
        if (media < 0)
                return -1;
        media &= ~mask;
        media |= mode;
-       if (bsd_set_if_media(s, ifname, media) < 0)
+       if (bsd_set_if_media(priv, media) < 0)
                return -1;
        return 0;
 }
 
 static int
-bsd_del_key(int s, const char *ifname, const u8 *addr, int key_idx)
+bsd_del_key(void *priv, const u8 *addr, int key_idx)
 {
        struct ieee80211req_del_key wk;
 
@@ -208,13 +239,11 @@ bsd_del_key(int s, const char *ifname, const u8 *addr, int key_idx)
                wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */
        }
 
-       return bsd_set80211var(s, ifname, IEEE80211_IOC_DELKEY, &wk,
-                              sizeof(wk));
+       return set80211var(priv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk));
 }
 
 static int
-bsd_send_mlme_param(int s, const char *ifname, const u8 op, const u16 reason,
-                   const u8 *addr)
+bsd_send_mlme_param(void *priv, const u8 op, const u16 reason, const u8 *addr)
 {
        struct ieee80211req_mlme mlme;
 
@@ -222,29 +251,34 @@ bsd_send_mlme_param(int s, const char *ifname, const u8 op, const u16 reason,
        mlme.im_op = op;
        mlme.im_reason = reason;
        os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return bsd_set80211var(s, ifname, IEEE80211_IOC_MLME, &mlme,
-                              sizeof(mlme));
+       return set80211var(priv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
 }
 
 static int
-bsd_ctrl_iface(int s, const char *ifname, int enable)
+bsd_ctrl_iface(void *priv, int enable)
 {
+       struct bsd_driver_data *drv = priv;
        struct ifreq ifr;
 
        os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
 
-       if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+       if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) < 0) {
                perror("ioctl[SIOCGIFFLAGS]");
                return -1;
        }
 
-       if (enable)
+       if (enable) {
+               if (ifr.ifr_flags & IFF_UP)
+                       return 0;
                ifr.ifr_flags |= IFF_UP;
-       else
+       } else {
+               if (!(ifr.ifr_flags & IFF_UP))
+                       return 0;
                ifr.ifr_flags &= ~IFF_UP;
+       }
 
-       if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
+       if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) < 0) {
                perror("ioctl[SIOCSIFFLAGS]");
                return -1;
        }
@@ -253,16 +287,28 @@ bsd_ctrl_iface(int s, const char *ifname, int enable)
 }
 
 static int
-bsd_set_key(int s, const char *ifname, enum wpa_alg alg,
+bsd_set_key(const char *ifname, void *priv, enum wpa_alg alg,
            const unsigned char *addr, int key_idx, int set_tx, const u8 *seq,
            size_t seq_len, const u8 *key, size_t key_len)
 {
        struct ieee80211req_key wk;
+#ifdef IEEE80211_KEY_NOREPLAY
+       struct bsd_driver_data *drv = priv;
+#endif /* IEEE80211_KEY_NOREPLAY */
 
        wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%p key_idx=%d set_tx=%d "
                   "seq_len=%zu key_len=%zu", __func__, alg, addr, key_idx,
                   set_tx, seq_len, key_len);
 
+       if (alg == WPA_ALG_NONE) {
+#ifndef HOSTAPD
+               if (addr == NULL || is_broadcast_ether_addr(addr))
+                       return bsd_del_key(priv, NULL, key_idx);
+               else
+#endif /* HOSTAPD */
+                       return bsd_del_key(priv, addr, key_idx);
+       }
+
        os_memset(&wk, 0, sizeof(wk));
        switch (alg) {
        case WPA_ALG_WEP:
@@ -293,8 +339,7 @@ bsd_set_key(int s, const char *ifname, enum wpa_alg alg,
                 * the address (yech).  Note also that we can only mark global
                 * keys default; doing this for a unicast key is an error.
                 */
-               if (os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
-                             IEEE80211_ADDR_LEN) == 0) {
+               if (is_broadcast_ether_addr(addr)) {
                        wk.ik_flags |= IEEE80211_KEY_GROUP;
                        wk.ik_keyix = key_idx;
                } else {
@@ -304,69 +349,40 @@ bsd_set_key(int s, const char *ifname, enum wpa_alg alg,
        }
        if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
                wk.ik_flags |= IEEE80211_KEY_DEFAULT;
+#ifndef HOSTAPD
+#ifdef IEEE80211_KEY_NOREPLAY
+       /*
+        * Ignore replay failures in IBSS and AHDEMO mode.
+        */
+       if (drv->opmode == IEEE80211_M_IBSS ||
+           drv->opmode == IEEE80211_M_AHDEMO)
+               wk.ik_flags |= IEEE80211_KEY_NOREPLAY;
+#endif /* IEEE80211_KEY_NOREPLAY */
+#endif /* HOSTAPD */
        wk.ik_keylen = key_len;
-       os_memcpy(&wk.ik_keyrsc, seq, seq_len);
+       if (seq) {
+#ifdef WORDS_BIGENDIAN
+               /*
+                * wk.ik_keyrsc is in host byte order (big endian), need to
+                * swap it to match with the byte order used in WPA.
+                */
+               int i;
+               u8 *keyrsc = (u8 *) &wk.ik_keyrsc;
+               for (i = 0; i < seq_len; i++)
+                       keyrsc[WPA_KEY_RSC_LEN - i - 1] = seq[i];
+#else /* WORDS_BIGENDIAN */
+               os_memcpy(&wk.ik_keyrsc, seq, seq_len);
+#endif /* WORDS_BIGENDIAN */
+       }
        os_memcpy(wk.ik_keydata, key, key_len);
 
-       return bsd_set80211var(s, ifname, IEEE80211_IOC_WPAKEY, &wk,
-                              sizeof(wk));
-}
-
-
-#ifdef HOSTAPD
-
-/*
- * Avoid conflicts with hostapd definitions by undefining couple of defines
- * from net80211 header files.
- */
-#undef RSN_VERSION
-#undef WPA_VERSION
-#undef WPA_OUI_TYPE
-
-#include "l2_packet/l2_packet.h"
-
-struct bsd_driver_data {
-       struct hostapd_data *hapd;              /* back pointer */
-
-       char    iface[IFNAMSIZ + 1];
-       struct l2_packet_data *sock_xmit;       /* raw packet xmit socket */
-       int     ioctl_sock;                     /* socket for ioctl() use */
-       int     wext_sock;                      /* socket for wireless events */
-};
-
-static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
-                         int reason_code);
-
-static int
-get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len)
-{
-       return bsd_get80211var(drv->ioctl_sock, drv->iface, op, arg, arg_len);
+       return set80211var(priv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk));
 }
 
 static int
-set80211param(struct bsd_driver_data *drv, int op, int arg)
-{
-       return bsd_set80211param(drv->ioctl_sock, drv->iface, op, arg);
-}
-
-static const char *
-ether_sprintf(const u8 *addr)
-{
-       static char buf[sizeof(MACSTR)];
-
-       if (addr != NULL)
-               snprintf(buf, sizeof(buf), MACSTR, MAC2STR(addr));
-       else
-               snprintf(buf, sizeof(buf), MACSTR, 0,0,0,0,0,0);
-       return buf;
-}
-
-/*
- * Configure WPA parameters.
- */
-static int
-bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
+bsd_configure_wpa(void *priv, struct wpa_bss_params *params)
 {
+#ifndef IEEE80211_IOC_APPIE
        static const char *ciphernames[] =
                { "WEP", "TKIP", "AES-OCB", "AES-CCM", "CKIP", "NONE" };
        int v;
@@ -394,7 +410,7 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        }
        wpa_printf(MSG_DEBUG, "%s: group key cipher=%s (%u)",
                   __func__, ciphernames[v], v);
-       if (set80211param(drv, IEEE80211_IOC_MCASTCIPHER, v)) {
+       if (set80211param(priv, IEEE80211_IOC_MCASTCIPHER, v)) {
                printf("Unable to set group key cipher to %u (%s)\n",
                        v, ciphernames[v]);
                return -1;
@@ -402,7 +418,7 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        if (v == IEEE80211_CIPHER_WEP) {
                /* key length is done only for specific ciphers */
                v = (params->wpa_group == WPA_CIPHER_WEP104 ? 13 : 5);
-               if (set80211param(drv, IEEE80211_IOC_MCASTKEYLEN, v)) {
+               if (set80211param(priv, IEEE80211_IOC_MCASTKEYLEN, v)) {
                        printf("Unable to set group key length to %u\n", v);
                        return -1;
                }
@@ -416,15 +432,15 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        if (params->wpa_pairwise & WPA_CIPHER_NONE)
                v |= 1<<IEEE80211_CIPHER_NONE;
        wpa_printf(MSG_DEBUG, "%s: pairwise key ciphers=0x%x", __func__, v);
-       if (set80211param(drv, IEEE80211_IOC_UCASTCIPHERS, v)) {
+       if (set80211param(priv, IEEE80211_IOC_UCASTCIPHERS, v)) {
                printf("Unable to set pairwise key ciphers to 0x%x\n", v);
                return -1;
        }
 
        wpa_printf(MSG_DEBUG, "%s: key management algorithms=0x%x",
                   __func__, params->wpa_key_mgmt);
-       if (set80211param(drv, IEEE80211_IOC_KEYMGTALGS, params->wpa_key_mgmt))
-       {
+       if (set80211param(priv, IEEE80211_IOC_KEYMGTALGS,
+                         params->wpa_key_mgmt)) {
                printf("Unable to set key management algorithms to 0x%x\n",
                        params->wpa_key_mgmt);
                return -1;
@@ -435,13 +451,14 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
                v |= BIT(0);
        wpa_printf(MSG_DEBUG, "%s: rsn capabilities=0x%x",
                   __func__, params->rsn_preauth);
-       if (set80211param(drv, IEEE80211_IOC_RSNCAPS, v)) {
+       if (set80211param(priv, IEEE80211_IOC_RSNCAPS, v)) {
                printf("Unable to set RSN capabilities to 0x%x\n", v);
                return -1;
        }
+#endif /* IEEE80211_IOC_APPIE */
 
        wpa_printf(MSG_DEBUG, "%s: enable WPA= 0x%x", __func__, params->wpa);
-       if (set80211param(drv, IEEE80211_IOC_WPA, params->wpa)) {
+       if (set80211param(priv, IEEE80211_IOC_WPA, params->wpa)) {
                printf("Unable to set WPA to %u\n", params->wpa);
                return -1;
        }
@@ -449,94 +466,179 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
 }
 
 static int
-hostapd_bsd_ctrl_iface(struct bsd_driver_data *drv, int enable)
-{
-       return bsd_ctrl_iface(drv->ioctl_sock, drv->iface, enable);
-}
-
-static int
 bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 {
-       struct bsd_driver_data *drv = priv;
-
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, params->enabled);
 
        if (!params->enabled) {
                /* XXX restore state */
                return set80211param(priv, IEEE80211_IOC_AUTHMODE,
-                       IEEE80211_AUTH_AUTO);
+                                    IEEE80211_AUTH_AUTO);
        }
        if (!params->wpa && !params->ieee802_1x) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "No 802.1X or WPA enabled!");
+               wpa_printf(MSG_ERROR, "%s: No 802.1X or WPA enabled",
+                          __func__);
                return -1;
        }
-       if (params->wpa && bsd_configure_wpa(drv, params) != 0) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "Error configuring WPA state!");
+       if (params->wpa && bsd_configure_wpa(priv, params) != 0) {
+               wpa_printf(MSG_ERROR, "%s: Failed to configure WPA state",
+                          __func__);
                return -1;
        }
        if (set80211param(priv, IEEE80211_IOC_AUTHMODE,
                (params->wpa ? IEEE80211_AUTH_WPA : IEEE80211_AUTH_8021X))) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "Error enabling WPA/802.1X!");
+               wpa_printf(MSG_ERROR, "%s: Failed to enable WPA/802.1X",
+                          __func__);
                return -1;
        }
-       return hostapd_bsd_ctrl_iface(drv, 1);
+       return bsd_ctrl_iface(priv, 1);
+}
+
+static void
+bsd_new_sta(void *priv, void *ctx, u8 addr[IEEE80211_ADDR_LEN])
+{
+       struct ieee80211req_wpaie ie;
+       int ielen = 0;
+       u8 *iebuf = NULL;
+
+       /*
+        * Fetch and validate any negotiated WPA/RSN parameters.
+        */
+       memset(&ie, 0, sizeof(ie));
+       memcpy(ie.wpa_macaddr, addr, IEEE80211_ADDR_LEN);
+       if (get80211var(priv, IEEE80211_IOC_WPAIE, &ie, sizeof(ie)) < 0) {
+               printf("Failed to get WPA/RSN information element.\n");
+               goto no_ie;
+       }
+       iebuf = ie.wpa_ie;
+       ielen = ie.wpa_ie[1];
+       if (ielen == 0)
+               iebuf = NULL;
+       else
+               ielen += 2;
+
+no_ie:
+       drv_event_assoc(ctx, addr, iebuf, ielen, 0);
 }
 
 static int
-bsd_set_privacy(const char *ifname, void *priv, int enabled)
+bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len,
+              int encrypt, const u8 *own_addr, u32 flags)
 {
        struct bsd_driver_data *drv = priv;
 
-       wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
+       wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", data, data_len);
 
-       return set80211param(drv, IEEE80211_IOC_PRIVACY, enabled);
+       return l2_packet_send(drv->sock_xmit, addr, ETH_P_EAPOL, data,
+                             data_len);
 }
 
 static int
-bsd_set_sta_authorized(void *priv, const u8 *addr, int authorized)
+bsd_set_freq(void *priv, struct hostapd_freq_params *freq)
 {
        struct bsd_driver_data *drv = priv;
+#ifdef SIOCS80211CHANNEL
+       struct ieee80211chanreq creq;
+#endif /* SIOCS80211CHANNEL */
+       u32 mode;
+       int channel = freq->channel;
+
+       if (channel < 14) {
+               mode =
+#ifdef CONFIG_IEEE80211N
+                       freq->ht_enabled ? IFM_IEEE80211_11NG :
+#endif /* CONFIG_IEEE80211N */
+                       IFM_IEEE80211_11G;
+       } else if (channel == 14) {
+               mode = IFM_IEEE80211_11B;
+       } else {
+               mode =
+#ifdef CONFIG_IEEE80211N
+                       freq->ht_enabled ? IFM_IEEE80211_11NA :
+#endif /* CONFIG_IEEE80211N */
+                       IFM_IEEE80211_11A;
+       }
+       if (bsd_set_mediaopt(drv, IFM_MMASK, mode) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set modulation mode",
+                          __func__);
+               return -1;
+       }
 
-       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface, authorized ?
-                                  IEEE80211_MLME_AUTHORIZE :
-                                  IEEE80211_MLME_UNAUTHORIZE, 0, addr);
+#ifdef SIOCS80211CHANNEL
+       os_memset(&creq, 0, sizeof(creq));
+       os_strlcpy(creq.i_name, drv->ifname, sizeof(creq.i_name));
+       creq.i_channel = (u_int16_t)channel;
+       return ioctl(drv->sock, SIOCS80211CHANNEL, &creq);
+#else /* SIOCS80211CHANNEL */
+       return set80211param(priv, IEEE80211_IOC_CHANNEL, channel);
+#endif /* SIOCS80211CHANNEL */
 }
 
 static int
-bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags, int flags_or,
-                 int flags_and)
+bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len)
 {
-       /* For now, only support setting Authorized flag */
-       if (flags_or & WPA_STA_AUTHORIZED)
-               return bsd_set_sta_authorized(priv, addr, 1);
-       if (!(flags_and & WPA_STA_AUTHORIZED))
-               return bsd_set_sta_authorized(priv, addr, 0);
+#ifdef IEEE80211_IOC_APPIE
+       wpa_printf(MSG_DEBUG, "%s: set WPA+RSN ie (len %lu)", __func__,
+                  (unsigned long)ie_len);
+       return bsd_set80211(priv, IEEE80211_IOC_APPIE, IEEE80211_APPIE_WPA,
+                           ie, ie_len);
+#endif /* IEEE80211_IOC_APPIE */
        return 0;
 }
 
-static int
-hostapd_bsd_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)
+static size_t
+rtbuf_len(void)
 {
-       struct bsd_driver_data *drv = priv;
+       size_t len;
 
-       if (alg == WPA_ALG_NONE)
-               return bsd_del_key(drv->ioctl_sock, drv->iface, addr, key_idx);
+       int mib[6] = {CTL_NET, AF_ROUTE, 0, AF_INET, NET_RT_DUMP, 0};
 
-       return bsd_set_key(drv->ioctl_sock, drv->iface, alg, addr, key_idx,
-                          set_tx, seq, seq_len, key, key_len);
+       if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
+               wpa_printf(MSG_WARNING, "%s failed: %s\n", __func__,
+                          strerror(errno));
+               len = 2048;
+       }
+
+       return len;
 }
 
+#ifdef HOSTAPD
+
+/*
+ * Avoid conflicts with hostapd definitions by undefining couple of defines
+ * from net80211 header files.
+ */
+#undef RSN_VERSION
+#undef WPA_VERSION
+#undef WPA_OUI_TYPE
+
+static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
+                         int reason_code);
+
+static const char *
+ether_sprintf(const u8 *addr)
+{
+       static char buf[sizeof(MACSTR)];
+
+       if (addr != NULL)
+               snprintf(buf, sizeof(buf), MACSTR, MAC2STR(addr));
+       else
+               snprintf(buf, sizeof(buf), MACSTR, 0,0,0,0,0,0);
+       return buf;
+}
+
+static int
+bsd_set_privacy(void *priv, int enabled)
+{
+       wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
+
+       return set80211param(priv, IEEE80211_IOC_PRIVACY, enabled);
+}
 
 static int
 bsd_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx,
               u8 *seq)
 {
-       struct bsd_driver_data *drv = priv;
        struct ieee80211req_key wk;
 
        wpa_printf(MSG_DEBUG, "%s: addr=%s idx=%d",
@@ -549,7 +651,7 @@ bsd_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx,
                memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
        wk.ik_keyix = idx;
 
-       if (get80211var(drv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk)) < 0) {
+       if (get80211var(priv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk)) < 0) {
                printf("Failed to get encryption.\n");
                return -1;
        }
@@ -588,11 +690,11 @@ static int
 bsd_read_sta_driver_data(void *priv, struct hostap_sta_driver_data *data,
                         const u8 *addr)
 {
-       struct bsd_driver_data *drv = priv;
        struct ieee80211req_sta_stats stats;
 
        memcpy(stats.is_u.macaddr, addr, IEEE80211_ADDR_LEN);
-       if (get80211var(drv, IEEE80211_IOC_STA_STATS, &stats, sizeof(stats)) > 0) {
+       if (get80211var(priv, IEEE80211_IOC_STA_STATS, &stats, sizeof(stats))
+           > 0) {
                /* XXX? do packets counts include non-data frames? */
                data->rx_packets = stats.is_stats.ns_rx_data;
                data->rx_bytes = stats.is_stats.ns_rx_bytes;
@@ -603,67 +705,24 @@ bsd_read_sta_driver_data(void *priv, struct hostap_sta_driver_data *data,
 }
 
 static int
-bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len)
-{
-       /*
-        * Do nothing; we setup parameters at startup that define the
-        * contents of the beacon information element.
-        */
-       return 0;
-}
-
-static int
 bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr, int reason_code)
 {
-       struct bsd_driver_data *drv = priv;
-
-       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
-                                  IEEE80211_MLME_DEAUTH, reason_code, addr);
+       return bsd_send_mlme_param(priv, IEEE80211_MLME_DEAUTH, reason_code,
+                                  addr);
 }
 
 static int
 bsd_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
                 int reason_code)
 {
-       struct bsd_driver_data *drv = priv;
-
-       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
-                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
-}
-
-static void
-bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
-{
-       struct hostapd_data *hapd = drv->hapd;
-       struct ieee80211req_wpaie ie;
-       int ielen = 0;
-       u8 *iebuf = NULL;
-
-       /*
-        * Fetch and validate any negotiated WPA/RSN parameters.
-        */
-       memset(&ie, 0, sizeof(ie));
-       memcpy(ie.wpa_macaddr, addr, IEEE80211_ADDR_LEN);
-       if (get80211var(drv, IEEE80211_IOC_WPAIE, &ie, sizeof(ie)) < 0) {
-               printf("Failed to get WPA/RSN information element.\n");
-               goto no_ie;
-       }
-       iebuf = ie.wpa_ie;
-       ielen = ie.wpa_ie[1];
-       if (ielen == 0)
-               iebuf = NULL;
-       else
-               ielen += 2;
-
-no_ie:
-       drv_event_assoc(hapd, addr, iebuf, ielen);
+       return bsd_send_mlme_param(priv, IEEE80211_MLME_DISASSOC, reason_code,
+                                  addr);
 }
 
 static void
 bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
 {
        struct bsd_driver_data *drv = ctx;
-       char buf[2048];
        struct if_announcemsghdr *ifan;
        struct rt_msghdr *rtm;
        struct ieee80211_michael_event *mic;
@@ -672,17 +731,18 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
        int n;
        union wpa_event_data data;
 
-       n = read(sock, buf, sizeof(buf));
+       n = read(sock, drv->event_buf, drv->event_buf_len);
        if (n < 0) {
                if (errno != EINTR && errno != EAGAIN)
-                       perror("read(PF_ROUTE)");
+                       wpa_printf(MSG_ERROR, "%s read() failed: %s\n",
+                                  __func__, strerror(errno));
                return;
        }
 
-       rtm = (struct rt_msghdr *) buf;
+       rtm = (struct rt_msghdr *) drv->event_buf;
        if (rtm->rtm_version != RTM_VERSION) {
-               wpa_printf(MSG_DEBUG, "Routing message version %d not "
-                       "understood\n", rtm->rtm_version);
+               wpa_printf(MSG_DEBUG, "Invalid routing message version=%d",
+                          rtm->rtm_version);
                return;
        }
        ifan = (struct if_announcemsghdr *) rtm;
@@ -703,7 +763,7 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
                case RTM_IEEE80211_REJOIN:
 #endif
                        join = (struct ieee80211_join_event *) &ifan[1];
-                       bsd_new_sta(drv, join->iev_addr);
+                       bsd_new_sta(drv, drv->hapd, join->iev_addr);
                        break;
                case RTM_IEEE80211_REPLAY:
                        /* ignore */
@@ -725,44 +785,6 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
        }
 }
 
-static int
-bsd_wireless_event_init(struct bsd_driver_data *drv)
-{
-       int s;
-
-       drv->wext_sock = -1;
-
-       s = socket(PF_ROUTE, SOCK_RAW, 0);
-       if (s < 0) {
-               perror("socket(PF_ROUTE,SOCK_RAW)");
-               return -1;
-       }
-       eloop_register_read_sock(s, bsd_wireless_event_receive, drv, NULL);
-       drv->wext_sock = s;
-
-       return 0;
-}
-
-static void
-bsd_wireless_event_deinit(struct bsd_driver_data *drv)
-{
-       if (drv->wext_sock < 0)
-               return;
-       eloop_unregister_read_sock(drv->wext_sock);
-       close(drv->wext_sock);
-}
-
-
-static int
-bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len,
-              int encrypt, const u8 *own_addr)
-{
-       struct bsd_driver_data *drv = priv;
-       wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", data, data_len);
-       return l2_packet_send(drv->sock_xmit, addr, ETH_P_EAPOL, data,
-                             data_len);
-}
-
 static void
 handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
 {
@@ -770,54 +792,6 @@ handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
        drv_event_eapol_rx(drv->hapd, src_addr, buf, len);
 }
 
-static int
-hostapd_bsd_get_ssid(const char *ifname, void *priv, u8 *buf, int len)
-{
-       struct bsd_driver_data *drv = priv;
-       int ssid_len;
-
-       ssid_len = bsd_get_ssid(drv->ioctl_sock, drv->iface, buf);
-       wpa_printf(MSG_DEBUG, "%s: ssid=\"%.*s\"", __func__, ssid_len, buf);
-
-       return ssid_len;
-}
-
-static int
-hostapd_bsd_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
-{
-       struct bsd_driver_data *drv = priv;
-
-       wpa_printf(MSG_DEBUG, "%s: ssid=\"%.*s\"", __func__, len, buf);
-
-       return bsd_set_ssid(drv->ioctl_sock, drv->iface, buf, len);
-}
-
-static int
-bsd_set_freq(void *priv, struct hostapd_freq_params *freq)
-{
-       struct bsd_driver_data *drv = priv;
-       struct ieee80211chanreq creq;
-       uint32_t mode;
-
-       if (freq->channel < 14)
-               mode = IFM_IEEE80211_11G;
-       else if (freq->channel == 14)
-               mode = IFM_IEEE80211_11B;
-       else
-               mode = IFM_IEEE80211_11A;
-       if (bsd_set_mediaopt(drv->ioctl_sock, drv->iface, IFM_MMASK,
-                            mode) < 0) {
-               wpa_printf(MSG_ERROR, "%s: failed to set modulation mode",
-                          __func__);
-               return -1;
-       }
-
-       os_memset(&creq, 0, sizeof(creq));
-       os_strlcpy(creq.i_name, drv->iface, sizeof(creq.i_name));
-       creq.i_channel = freq->channel;
-       return ioctl(drv->ioctl_sock, SIOCS80211CHANNEL, &creq);
-}
-
 static void *
 bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 {
@@ -825,19 +799,27 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 
        drv = os_zalloc(sizeof(struct bsd_driver_data));
        if (drv == NULL) {
-               printf("Could not allocate memory for bsd driver data\n");
+               wpa_printf(MSG_ERROR, "Could not allocate memory for bsd driver data");
+               return NULL;
+       }
+
+       drv->event_buf_len = rtbuf_len();
+
+       drv->event_buf = os_malloc(drv->event_buf_len);
+       if (drv->event_buf == NULL) {
+               wpa_printf(MSG_ERROR, "%s: os_malloc() failed", __func__);
                goto bad;
        }
 
        drv->hapd = hapd;
-       drv->ioctl_sock = socket(PF_INET, SOCK_DGRAM, 0);
-       if (drv->ioctl_sock < 0) {
+       drv->sock = socket(PF_INET, SOCK_DGRAM, 0);
+       if (drv->sock < 0) {
                perror("socket[PF_INET,SOCK_DGRAM]");
                goto bad;
        }
-       memcpy(drv->iface, params->ifname, sizeof(drv->iface));
+       os_strlcpy(drv->ifname, params->ifname, sizeof(drv->ifname));
 
-       drv->sock_xmit = l2_packet_init(drv->iface, NULL, ETH_P_EAPOL,
+       drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
                                        handle_read, drv, 0);
        if (drv->sock_xmit == NULL)
                goto bad;
@@ -845,13 +827,18 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
                goto bad;
 
        /* mark down during setup */
-       if (hostapd_bsd_ctrl_iface(drv, 0) < 0)
+       if (bsd_ctrl_iface(drv, 0) < 0)
                goto bad;
-       if (bsd_wireless_event_init(drv))
+
+       drv->route = socket(PF_ROUTE, SOCK_RAW, 0);
+       if (drv->route < 0) {
+               perror("socket(PF_ROUTE,SOCK_RAW)");
                goto bad;
+       }
+       eloop_register_read_sock(drv->route, bsd_wireless_event_receive, drv,
+                                NULL);
 
-       if (bsd_set_mediaopt(drv->ioctl_sock, drv->iface, IFM_OMASK,
-                            IFM_IEEE80211_HOSTAP) < 0) {
+       if (bsd_set_mediaopt(drv, IFM_OMASK, IFM_IEEE80211_HOSTAP) < 0) {
                wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
                           __func__);
                goto bad;
@@ -861,8 +848,9 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 bad:
        if (drv->sock_xmit != NULL)
                l2_packet_deinit(drv->sock_xmit);
-       if (drv->ioctl_sock >= 0)
-               close(drv->ioctl_sock);
+       if (drv->sock >= 0)
+               close(drv->sock);
+       os_free(drv->event_buf);
        if (drv != NULL)
                os_free(drv);
        return NULL;
@@ -874,91 +862,66 @@ bsd_deinit(void *priv)
 {
        struct bsd_driver_data *drv = priv;
 
-       bsd_wireless_event_deinit(drv);
-       hostapd_bsd_ctrl_iface(drv, 0);
-       if (drv->ioctl_sock >= 0)
-               close(drv->ioctl_sock);
+       if (drv->route >= 0) {
+               eloop_unregister_read_sock(drv->route);
+               close(drv->route);
+       }
+       bsd_ctrl_iface(drv, 0);
+       if (drv->sock >= 0)
+               close(drv->sock);
        if (drv->sock_xmit != NULL)
                l2_packet_deinit(drv->sock_xmit);
+       os_free(drv->event_buf);
        os_free(drv);
 }
 
-const struct wpa_driver_ops wpa_driver_bsd_ops = {
-       .name                   = "bsd",
-       .hapd_init              = bsd_init,
-       .hapd_deinit            = bsd_deinit,
-       .set_ieee8021x          = bsd_set_ieee8021x,
-       .set_privacy            = bsd_set_privacy,
-       .set_key                = hostapd_bsd_set_key,
-       .get_seqnum             = bsd_get_seqnum,
-       .flush                  = bsd_flush,
-       .set_generic_elem       = bsd_set_opt_ie,
-       .sta_set_flags          = bsd_sta_set_flags,
-       .read_sta_data          = bsd_read_sta_driver_data,
-       .hapd_send_eapol        = bsd_send_eapol,
-       .sta_disassoc           = bsd_sta_disassoc,
-       .sta_deauth             = bsd_sta_deauth,
-       .hapd_set_ssid          = hostapd_bsd_set_ssid,
-       .hapd_get_ssid          = hostapd_bsd_get_ssid,
-       .set_freq               = bsd_set_freq,
-};
-
-#else /* HOSTAPD */
-
-struct wpa_driver_bsd_data {
-       int     sock;                   /* open socket for 802.11 ioctls */
-       int     route;                  /* routing socket for events */
-       char    ifname[IFNAMSIZ+1];     /* interface name */
-       unsigned int ifindex;           /* interface index */
-       void    *ctx;
-       int     prev_roaming;           /* roaming state to restore on deinit */
-       int     prev_privacy;           /* privacy state to restore on deinit */
-       int     prev_wpa;               /* wpa state to restore on deinit */
-};
 
 static int
-set80211var(struct wpa_driver_bsd_data *drv, int op, const void *arg, int arg_len)
+bsd_commit(void *priv)
 {
-       return bsd_set80211var(drv->sock, drv->ifname, op, arg, arg_len);
+       return bsd_ctrl_iface(priv, 1);
 }
 
-static int
-get80211var(struct wpa_driver_bsd_data *drv, int op, void *arg, int arg_len)
-{
-       return bsd_get80211var(drv->sock, drv->ifname, op, arg, arg_len);
-}
 
 static int
-set80211param(struct wpa_driver_bsd_data *drv, int op, int arg)
+bsd_set_sta_authorized(void *priv, const u8 *addr,
+                      int total_flags, int flags_or, int flags_and)
 {
-       return bsd_set80211param(drv->sock, drv->ifname, op, arg);
+       int authorized = -1;
+
+       /* For now, only support setting Authorized flag */
+       if (flags_or & WPA_STA_AUTHORIZED)
+               authorized = 1;
+       if (!(flags_and & WPA_STA_AUTHORIZED))
+               authorized = 0;
+
+       if (authorized < 0)
+               return 0;
+
+       return bsd_send_mlme_param(priv, authorized ?
+                                  IEEE80211_MLME_AUTHORIZE :
+                                  IEEE80211_MLME_UNAUTHORIZE, 0, addr);
 }
+#else /* HOSTAPD */
 
 static int
-get80211param(struct wpa_driver_bsd_data *drv, int op)
+get80211param(struct bsd_driver_data *drv, int op)
 {
        struct ieee80211req ireq;
 
-       os_memset(&ireq, 0, sizeof(ireq));
-       os_strlcpy(ireq.i_name, drv->ifname, sizeof(ireq.i_name));
-       ireq.i_type = op;
-
-       if (ioctl(drv->sock, SIOCG80211, &ireq) < 0) {
-               fprintf(stderr, "ioctl[SIOCG80211, op %u]: %s\n",
-                       op, strerror(errno));
+       if (bsd_get80211(drv, &ireq, op, NULL, 0) < 0)
                return -1;
-       }
        return ireq.i_val;
 }
 
 static int
 wpa_driver_bsd_get_bssid(void *priv, u8 *bssid)
 {
-       struct wpa_driver_bsd_data *drv = priv;
+       struct bsd_driver_data *drv = priv;
 #ifdef SIOCG80211BSSID
        struct ieee80211_bssid bs;
 
-       os_strncpy(bs.i_name, drv->ifname, sizeof(bs.i_name));
+       os_strlcpy(bs.i_name, drv->ifname, sizeof(bs.i_name));
        if (ioctl(drv->sock, SIOCG80211BSSID, &bs) < 0)
                return -1;
        os_memcpy(bssid, bs.i_bssid, sizeof(bs.i_bssid));
@@ -969,40 +932,19 @@ wpa_driver_bsd_get_bssid(void *priv, u8 *bssid)
 #endif
 }
 
-#if 0
-static int
-wpa_driver_bsd_set_bssid(void *priv, const char *bssid)
-{
-       struct wpa_driver_bsd_data *drv = priv;
-
-       return set80211var(drv, IEEE80211_IOC_BSSID,
-               bssid, IEEE80211_ADDR_LEN);
-}
-#endif
-
 static int
 wpa_driver_bsd_get_ssid(void *priv, u8 *ssid)
 {
-       struct wpa_driver_bsd_data *drv = priv;
-
-       return bsd_get_ssid(drv->sock, drv->ifname, ssid);
-}
-
-static int
-wpa_driver_bsd_set_ssid(void *priv, const u8 *ssid,
-                            size_t ssid_len)
-{
-       struct wpa_driver_bsd_data *drv = priv;
-
-       return bsd_set_ssid(drv->sock, drv->ifname, ssid, ssid_len);
+       struct bsd_driver_data *drv = priv;
+       return bsd_get_ssid(drv, ssid, 0);
 }
 
 static int
-wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_data *drv,
-       const u8 *wpa_ie, size_t wpa_ie_len)
+wpa_driver_bsd_set_wpa_ie(struct bsd_driver_data *drv, const u8 *wpa_ie,
+                         size_t wpa_ie_len)
 {
 #ifdef IEEE80211_IOC_APPIE
-       return set80211var(drv, IEEE80211_IOC_APPIE, wpa_ie, wpa_ie_len);
+       return bsd_set_opt_ie(drv, wpa_ie, wpa_ie_len);
 #else /* IEEE80211_IOC_APPIE */
        return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len);
 #endif /* IEEE80211_IOC_APPIE */
@@ -1011,17 +953,16 @@ wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_data *drv,
 static int
 wpa_driver_bsd_set_wpa_internal(void *priv, int wpa, int privacy)
 {
-       struct wpa_driver_bsd_data *drv = priv;
        int ret = 0;
 
        wpa_printf(MSG_DEBUG, "%s: wpa=%d privacy=%d",
                __FUNCTION__, wpa, privacy);
 
-       if (!wpa && wpa_driver_bsd_set_wpa_ie(drv, NULL, 0) < 0)
+       if (!wpa && wpa_driver_bsd_set_wpa_ie(priv, NULL, 0) < 0)
                ret = -1;
-       if (set80211param(drv, IEEE80211_IOC_PRIVACY, privacy) < 0)
+       if (set80211param(priv, IEEE80211_IOC_PRIVACY, privacy) < 0)
                ret = -1;
-       if (set80211param(drv, IEEE80211_IOC_WPA, wpa) < 0)
+       if (set80211param(priv, IEEE80211_IOC_WPA, wpa) < 0)
                ret = -1;
 
        return ret;
@@ -1036,69 +977,30 @@ wpa_driver_bsd_set_wpa(void *priv, int enabled)
 }
 
 static int
-wpa_driver_bsd_set_key(const char *ifname, void *priv, enum wpa_alg alg,
-                      const unsigned char *addr, int key_idx, int set_tx,
-                      const u8 *seq, size_t seq_len,
-                      const u8 *key, size_t key_len)
-{
-       struct wpa_driver_bsd_data *drv = priv;
-
-       if (alg == WPA_ALG_NONE) {
-               if (addr == NULL ||
-                   os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
-                             IEEE80211_ADDR_LEN) == 0)
-                       return bsd_del_key(drv->sock, drv->ifname, NULL,
-                                          key_idx);
-               else
-                       return bsd_del_key(drv->sock, drv->ifname, addr,
-                                          key_idx);
-       }
-
-       return bsd_set_key(drv->sock, drv->ifname, alg, addr, key_idx, set_tx,
-                          seq, seq_len, key, key_len);
-}
-
-static int
 wpa_driver_bsd_set_countermeasures(void *priv, int enabled)
 {
-       struct wpa_driver_bsd_data *drv = priv;
-
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
-       return set80211param(drv, IEEE80211_IOC_COUNTERMEASURES, enabled);
+       return set80211param(priv, IEEE80211_IOC_COUNTERMEASURES, enabled);
 }
 
 
 static int
 wpa_driver_bsd_set_drop_unencrypted(void *priv, int enabled)
 {
-       struct wpa_driver_bsd_data *drv = priv;
-
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
-       return set80211param(drv, IEEE80211_IOC_DROPUNENCRYPTED, enabled);
+       return set80211param(priv, IEEE80211_IOC_DROPUNENCRYPTED, enabled);
 }
 
 static int
 wpa_driver_bsd_deauthenticate(void *priv, const u8 *addr, int reason_code)
 {
-       struct wpa_driver_bsd_data *drv = priv;
-
-       return bsd_send_mlme_param(drv->sock, drv->ifname,
-                                  IEEE80211_MLME_DEAUTH, reason_code, addr);
-}
-
-static int
-wpa_driver_bsd_disassociate(void *priv, const u8 *addr, int reason_code)
-{
-       struct wpa_driver_bsd_data *drv = priv;
-
-       return bsd_send_mlme_param(drv->sock, drv->ifname,
-                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
+       return bsd_send_mlme_param(priv, IEEE80211_MLME_DEAUTH, reason_code,
+                                  addr);
 }
 
 static int
 wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
 {
-       struct wpa_driver_bsd_data *drv = priv;
        int authmode;
 
        if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
@@ -1109,14 +1011,23 @@ wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
        else
                authmode = IEEE80211_AUTH_OPEN;
 
-       return set80211param(drv, IEEE80211_IOC_AUTHMODE, authmode);
+       return set80211param(priv, IEEE80211_IOC_AUTHMODE, authmode);
+}
+
+static void
+handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
+{
+       struct bsd_driver_data *drv = ctx;
+
+       drv_event_eapol_rx(drv->ctx, src_addr, buf, len);
 }
 
 static int
 wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
 {
-       struct wpa_driver_bsd_data *drv = priv;
+       struct bsd_driver_data *drv = priv;
        struct ieee80211req_mlme mlme;
+       u32 mode;
        int privacy;
        int ret = 0;
 
@@ -1130,6 +1041,35 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
                , params->key_mgmt_suite
        );
 
+       switch (params->mode) {
+       case IEEE80211_MODE_INFRA:
+               mode = 0 /* STA */;
+               break;
+       case IEEE80211_MODE_IBSS:
+               mode = IFM_IEEE80211_IBSS;
+               break;
+       case IEEE80211_MODE_AP:
+               mode = IFM_IEEE80211_HOSTAP;
+               break;
+       default:
+               wpa_printf(MSG_ERROR, "%s: unknown operation mode", __func__);
+               return -1;
+       }
+       if (bsd_set_mediaopt(drv, IFM_OMASK, mode) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
+               return -1;
+       }
+
+       if (params->mode == IEEE80211_MODE_AP) {
+               drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
+                                               handle_read, drv, 0);
+               if (drv->sock_xmit == NULL)
+                       return -1;
+               drv->is_ap = 1;
+               return 0;
+       }
+
        if (wpa_driver_bsd_set_drop_unencrypted(drv, params->drop_unencrypted)
            < 0)
                ret = -1;
@@ -1139,9 +1079,9 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
        if (wpa_driver_bsd_set_wpa_ie(drv, params->wpa_ie, params->wpa_ie_len) < 0)
                return -1;
 
-       privacy = !(params->pairwise_suite == CIPHER_NONE &&
-           params->group_suite == CIPHER_NONE &&
-           params->key_mgmt_suite == KEY_MGMT_NONE &&
+       privacy = !(params->pairwise_suite == WPA_CIPHER_NONE &&
+           params->group_suite == WPA_CIPHER_NONE &&
+           params->key_mgmt_suite == WPA_KEY_MGMT_NONE &&
            params->wpa_ie_len == 0);
        wpa_printf(MSG_DEBUG, "%s: set PRIVACY %u", __func__, privacy);
 
@@ -1166,53 +1106,98 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
 }
 
 static int
-wpa_driver_bsd_ctrl_iface(struct wpa_driver_bsd_data *drv, int enable)
-{
-       return bsd_ctrl_iface(drv->sock, drv->ifname, enable);
-}
-
-static int
 wpa_driver_bsd_scan(void *priv, struct wpa_driver_scan_params *params)
 {
-       struct wpa_driver_bsd_data *drv = priv;
-       const u8 *ssid = params->ssids[0].ssid;
-       size_t ssid_len = params->ssids[0].ssid_len;
+       struct bsd_driver_data *drv = priv;
+#ifdef IEEE80211_IOC_SCAN_MAX_SSID
+       struct ieee80211_scan_req sr;
+       int i;
+#endif /* IEEE80211_IOC_SCAN_MAX_SSID */
+
+       if (bsd_set_mediaopt(drv, IFM_OMASK, 0 /* STA */) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
+               return -1;
+       }
+
+       if (set80211param(drv, IEEE80211_IOC_ROAMING,
+                         IEEE80211_ROAMING_MANUAL) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set "
+                          "wpa_supplicant-based roaming: %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
+       if (wpa_driver_bsd_set_wpa(drv, 1) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set wpa: %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
 
        /* NB: interface must be marked UP to do a scan */
-       if (wpa_driver_bsd_ctrl_iface(drv, 1) < 0)
+       if (bsd_ctrl_iface(drv, 1) < 0)
                return -1;
 
+#ifdef IEEE80211_IOC_SCAN_MAX_SSID
+       os_memset(&sr, 0, sizeof(sr));
+       sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE | IEEE80211_IOC_SCAN_ONCE |
+               IEEE80211_IOC_SCAN_NOJOIN;
+       sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;
+       if (params->num_ssids > 0) {
+               sr.sr_nssid = params->num_ssids;
+#if 0
+               /* Boundary check is done by upper layer */
+               if (sr.sr_nssid > IEEE80211_IOC_SCAN_MAX_SSID)
+                       sr.sr_nssid = IEEE80211_IOC_SCAN_MAX_SSID;
+#endif
+
+               /* NB: check scan cache first */
+               sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK;
+       }
+       for (i = 0; i < sr.sr_nssid; i++) {
+               sr.sr_ssid[i].len = params->ssids[i].ssid_len;
+               os_memcpy(sr.sr_ssid[i].ssid, params->ssids[i].ssid,
+                         sr.sr_ssid[i].len);
+       }
+
+       /* NB: net80211 delivers a scan complete event so no need to poll */
+       return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr));
+#else /* IEEE80211_IOC_SCAN_MAX_SSID */
        /* set desired ssid before scan */
-       if (wpa_driver_bsd_set_ssid(drv, ssid, ssid_len) < 0)
+       if (bsd_set_ssid(drv, params->ssids[0].ssid,
+                        params->ssids[0].ssid_len) < 0)
                return -1;
 
        /* NB: net80211 delivers a scan complete event so no need to poll */
        return set80211param(drv, IEEE80211_IOC_SCAN_REQ, 0);
+#endif /* IEEE80211_IOC_SCAN_MAX_SSID */
 }
 
 static void
 wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
 {
-       struct wpa_driver_bsd_data *drv = sock_ctx;
-       char buf[2048];
+       struct bsd_driver_data *drv = sock_ctx;
        struct if_announcemsghdr *ifan;
        struct if_msghdr *ifm;
        struct rt_msghdr *rtm;
        union wpa_event_data event;
        struct ieee80211_michael_event *mic;
+       struct ieee80211_leave_event *leave;
+       struct ieee80211_join_event *join;
        int n;
 
-       n = read(sock, buf, sizeof(buf));
+       n = read(sock, drv->event_buf, drv->event_buf_len);
        if (n < 0) {
                if (errno != EINTR && errno != EAGAIN)
-                       perror("read(PF_ROUTE)");
+                       wpa_printf(MSG_ERROR, "%s read() failed: %s\n",
+                                  __func__, strerror(errno));
                return;
        }
 
-       rtm = (struct rt_msghdr *) buf;
+       rtm = (struct rt_msghdr *) drv->event_buf;
        if (rtm->rtm_version != RTM_VERSION) {
-               wpa_printf(MSG_DEBUG, "Routing message version %d not "
-                       "understood\n", rtm->rtm_version);
+               wpa_printf(MSG_DEBUG, "Invalid routing message version=%d",
+                          rtm->rtm_version);
                return;
        }
        os_memset(&event, 0, sizeof(event));
@@ -1221,8 +1206,8 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
                ifan = (struct if_announcemsghdr *) rtm;
                if (ifan->ifan_index != drv->ifindex)
                        break;
-               strlcpy(event.interface_status.ifname, drv->ifname,
-                       sizeof(event.interface_status.ifname));
+               os_strlcpy(event.interface_status.ifname, drv->ifname,
+                          sizeof(event.interface_status.ifname));
                switch (ifan->ifan_what) {
                case IFAN_DEPARTURE:
                        event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
@@ -1242,14 +1227,31 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
                switch (ifan->ifan_what) {
                case RTM_IEEE80211_ASSOC:
                case RTM_IEEE80211_REASSOC:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_ASSOC, NULL);
                        break;
                case RTM_IEEE80211_DISASSOC:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL);
                        break;
                case RTM_IEEE80211_SCAN:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL);
                        break;
+               case RTM_IEEE80211_LEAVE:
+                       leave = (struct ieee80211_leave_event *) &ifan[1];
+                       drv_event_disassoc(ctx, leave->iev_addr);
+                       break;
+               case RTM_IEEE80211_JOIN:
+#ifdef RTM_IEEE80211_REJOIN
+               case RTM_IEEE80211_REJOIN:
+#endif
+                       join = (struct ieee80211_join_event *) &ifan[1];
+                       bsd_new_sta(drv, ctx, join->iev_addr);
+                       break;
                case RTM_IEEE80211_REPLAY:
                        /* ignore */
                        break;
@@ -1273,8 +1275,8 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
                if (ifm->ifm_index != drv->ifindex)
                        break;
                if ((rtm->rtm_flags & RTF_UP) == 0) {
-                       strlcpy(event.interface_status.ifname, drv->ifname,
-                               sizeof(event.interface_status.ifname));
+                       os_strlcpy(event.interface_status.ifname, drv->ifname,
+                                  sizeof(event.interface_status.ifname));
                        event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
                        wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
                                   event.interface_status.ifname);
@@ -1306,6 +1308,11 @@ wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res,
        result->caps = sr->isr_capinfo;
        result->qual = sr->isr_rssi;
        result->noise = sr->isr_noise;
+       /*
+        * the rssi value reported by the kernel is in 0.5dB steps relative to
+        * the reported noise floor. see ieee80211_node.h for details.
+        */
+       result->level = sr->isr_rssi / 2 + sr->isr_noise;
 
        pos = (u8 *)(result + 1);
 
@@ -1332,8 +1339,8 @@ wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res,
 
        result->ie_len = pos - (u8 *)(result + 1);
 
-       tmp = os_realloc(res->res,
-                        (res->num + 1) * sizeof(struct wpa_scan_res *));
+       tmp = os_realloc_array(res->res, res->num + 1,
+                              sizeof(struct wpa_scan_res *));
        if (tmp == NULL) {
                os_free(result);
                return;
@@ -1345,13 +1352,12 @@ wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res,
 struct wpa_scan_results *
 wpa_driver_bsd_get_scan_results2(void *priv)
 {
-       struct wpa_driver_bsd_data *drv = priv;
        struct ieee80211req_scan_result *sr;
        struct wpa_scan_results *res;
        int len, rest;
        uint8_t buf[24*1024], *pos;
 
-       len = get80211var(drv, IEEE80211_IOC_SCAN_RESULTS, buf, 24*1024);
+       len = get80211var(priv, IEEE80211_IOC_SCAN_RESULTS, buf, 24*1024);
        if (len < 0)
                return NULL;
 
@@ -1374,16 +1380,126 @@ wpa_driver_bsd_get_scan_results2(void *priv)
        return res;
 }
 
+static int wpa_driver_bsd_capa(struct bsd_driver_data *drv)
+{
+#ifdef IEEE80211_IOC_DEVCAPS
+/* kernel definitions copied from net80211/ieee80211_var.h */
+#define IEEE80211_CIPHER_WEP            0
+#define IEEE80211_CIPHER_TKIP           1
+#define IEEE80211_CIPHER_AES_CCM        3
+#define IEEE80211_CRYPTO_WEP            (1<<IEEE80211_CIPHER_WEP)
+#define IEEE80211_CRYPTO_TKIP           (1<<IEEE80211_CIPHER_TKIP)
+#define IEEE80211_CRYPTO_AES_CCM        (1<<IEEE80211_CIPHER_AES_CCM)
+#define IEEE80211_C_HOSTAP      0x00000400      /* CAPABILITY: HOSTAP avail */
+#define IEEE80211_C_WPA1        0x00800000      /* CAPABILITY: WPA1 avail */
+#define IEEE80211_C_WPA2        0x01000000      /* CAPABILITY: WPA2 avail */
+       struct ieee80211_devcaps_req devcaps;
+
+       if (get80211var(drv, IEEE80211_IOC_DEVCAPS, &devcaps,
+                       sizeof(devcaps)) < 0) {
+               wpa_printf(MSG_ERROR, "failed to IEEE80211_IOC_DEVCAPS: %s",
+                          strerror(errno));
+               return -1;
+       }
+
+       wpa_printf(MSG_DEBUG, "%s: drivercaps=0x%08x,cryptocaps=0x%08x",
+                  __func__, devcaps.dc_drivercaps, devcaps.dc_cryptocaps);
+
+       if (devcaps.dc_drivercaps & IEEE80211_C_WPA1)
+               drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA |
+                       WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK;
+       if (devcaps.dc_drivercaps & IEEE80211_C_WPA2)
+               drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
+                       WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK;
+
+       if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_WEP)
+               drv->capa.enc |= WPA_DRIVER_CAPA_ENC_WEP40 |
+                       WPA_DRIVER_CAPA_ENC_WEP104;
+       if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_TKIP)
+               drv->capa.enc |= WPA_DRIVER_CAPA_ENC_TKIP;
+       if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_CCM)
+               drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP;
+
+       if (devcaps.dc_drivercaps & IEEE80211_C_HOSTAP)
+               drv->capa.flags |= WPA_DRIVER_FLAGS_AP;
+#undef IEEE80211_CIPHER_WEP
+#undef IEEE80211_CIPHER_TKIP
+#undef IEEE80211_CIPHER_AES_CCM
+#undef IEEE80211_CRYPTO_WEP
+#undef IEEE80211_CRYPTO_TKIP
+#undef IEEE80211_CRYPTO_AES_CCM
+#undef IEEE80211_C_HOSTAP
+#undef IEEE80211_C_WPA1
+#undef IEEE80211_C_WPA2
+#else /* IEEE80211_IOC_DEVCAPS */
+       /* For now, assume TKIP, CCMP, WPA, WPA2 are supported */
+       drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK;
+       drv->capa.enc = WPA_DRIVER_CAPA_ENC_WEP40 |
+               WPA_DRIVER_CAPA_ENC_WEP104 |
+               WPA_DRIVER_CAPA_ENC_TKIP |
+               WPA_DRIVER_CAPA_ENC_CCMP;
+       drv->capa.flags |= WPA_DRIVER_FLAGS_AP;
+#endif /* IEEE80211_IOC_DEVCAPS */
+#ifdef IEEE80211_IOC_SCAN_MAX_SSID
+       drv->capa.max_scan_ssids = IEEE80211_IOC_SCAN_MAX_SSID;
+#else /* IEEE80211_IOC_SCAN_MAX_SSID */
+       drv->capa.max_scan_ssids = 1;
+#endif /* IEEE80211_IOC_SCAN_MAX_SSID */
+       drv->capa.auth = WPA_DRIVER_AUTH_OPEN |
+               WPA_DRIVER_AUTH_SHARED |
+               WPA_DRIVER_AUTH_LEAP;
+       return 0;
+}
+
+static enum ieee80211_opmode
+get80211opmode(struct bsd_driver_data *drv)
+{
+       struct ifmediareq ifmr;
+
+       (void) memset(&ifmr, 0, sizeof(ifmr));
+       (void) os_strlcpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name));
+
+       if (ioctl(drv->sock, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0) {
+               if (ifmr.ifm_current & IFM_IEEE80211_ADHOC) {
+                       if (ifmr.ifm_current & IFM_FLAG0)
+                               return IEEE80211_M_AHDEMO;
+                       else
+                               return IEEE80211_M_IBSS;
+               }
+               if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP)
+                       return IEEE80211_M_HOSTAP;
+               if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
+                       return IEEE80211_M_MONITOR;
+#ifdef IEEE80211_M_MBSS
+               if (ifmr.ifm_current & IFM_IEEE80211_MBSS)
+                       return IEEE80211_M_MBSS;
+#endif /* IEEE80211_M_MBSS */
+       }
+       return IEEE80211_M_STA;
+}
+
 static void *
 wpa_driver_bsd_init(void *ctx, const char *ifname)
 {
 #define        GETPARAM(drv, param, v) \
        (((v) = get80211param(drv, param)) != -1)
-       struct wpa_driver_bsd_data *drv;
+       struct bsd_driver_data *drv;
 
        drv = os_zalloc(sizeof(*drv));
        if (drv == NULL)
                return NULL;
+
+       drv->event_buf_len = rtbuf_len();
+
+       drv->event_buf = os_malloc(drv->event_buf_len);
+       if (drv->event_buf == NULL) {
+               wpa_printf(MSG_ERROR, "%s: os_malloc() failed", __func__);
+               goto fail1;
+       }
+
        /*
         * NB: We require the interface name be mappable to an index.
         *     This implies we do not support having wpa_supplicant
@@ -1399,6 +1515,12 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
        drv->sock = socket(PF_INET, SOCK_DGRAM, 0);
        if (drv->sock < 0)
                goto fail1;
+
+       os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
+       /* Down interface during setup. */
+       if (bsd_ctrl_iface(drv, 0) < 0)
+               goto fail;
+
        drv->route = socket(PF_ROUTE, SOCK_RAW, 0);
        if (drv->route < 0)
                goto fail;
@@ -1406,7 +1528,6 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
                wpa_driver_bsd_event_receive, ctx, drv);
 
        drv->ctx = ctx;
-       os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
 
        if (!GETPARAM(drv, IEEE80211_IOC_ROAMING, drv->prev_roaming)) {
                wpa_printf(MSG_DEBUG, "%s: failed to get roaming state: %s",
@@ -1424,30 +1545,16 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
                goto fail;
        }
 
-       if (bsd_set_mediaopt(drv->sock, drv->ifname, IFM_OMASK,
-                            0 /* STA */) < 0) {
-               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
-                          __func__);
-               goto fail;
-       }
-       if (set80211param(drv, IEEE80211_IOC_ROAMING, IEEE80211_ROAMING_MANUAL) < 0) {
-               wpa_printf(MSG_DEBUG, "%s: failed to set wpa_supplicant-based "
-                          "roaming: %s", __func__, strerror(errno));
-               goto fail;
-       }
-
-       if (set80211param(drv, IEEE80211_IOC_WPA, 1+2) < 0) {
-               wpa_printf(MSG_DEBUG, "%s: failed to enable WPA support %s",
-                          __func__, strerror(errno));
+       if (wpa_driver_bsd_capa(drv))
                goto fail;
-       }
 
-       wpa_driver_bsd_set_wpa(drv, 1);
+       drv->opmode = get80211opmode(drv);
 
        return drv;
 fail:
        close(drv->sock);
 fail1:
+       os_free(drv->event_buf);
        os_free(drv);
        return NULL;
 #undef GETPARAM
@@ -1456,39 +1563,69 @@ fail1:
 static void
 wpa_driver_bsd_deinit(void *priv)
 {
-       struct wpa_driver_bsd_data *drv = priv;
+       struct bsd_driver_data *drv = priv;
 
        wpa_driver_bsd_set_wpa(drv, 0);
        eloop_unregister_read_sock(drv->route);
 
        /* NB: mark interface down */
-       wpa_driver_bsd_ctrl_iface(drv, 0);
+       bsd_ctrl_iface(drv, 0);
 
        wpa_driver_bsd_set_wpa_internal(drv, drv->prev_wpa, drv->prev_privacy);
        if (set80211param(drv, IEEE80211_IOC_ROAMING, drv->prev_roaming) < 0)
                wpa_printf(MSG_DEBUG, "%s: failed to restore roaming state",
                        __func__);
 
+       if (drv->sock_xmit != NULL)
+               l2_packet_deinit(drv->sock_xmit);
        (void) close(drv->route);               /* ioctl socket */
        (void) close(drv->sock);                /* event socket */
+       os_free(drv->event_buf);
        os_free(drv);
 }
 
+static int
+wpa_driver_bsd_get_capa(void *priv, struct wpa_driver_capa *capa)
+{
+       struct bsd_driver_data *drv = priv;
+
+       os_memcpy(capa, &drv->capa, sizeof(*capa));
+       return 0;
+}
+#endif /* HOSTAPD */
+
 
 const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .name                   = "bsd",
        .desc                   = "BSD 802.11 support",
+#ifdef HOSTAPD
+       .hapd_init              = bsd_init,
+       .hapd_deinit            = bsd_deinit,
+       .set_privacy            = bsd_set_privacy,
+       .get_seqnum             = bsd_get_seqnum,
+       .flush                  = bsd_flush,
+       .read_sta_data          = bsd_read_sta_driver_data,
+       .sta_disassoc           = bsd_sta_disassoc,
+       .sta_deauth             = bsd_sta_deauth,
+       .sta_set_flags          = bsd_set_sta_authorized,
+       .commit                 = bsd_commit,
+#else /* HOSTAPD */
        .init                   = wpa_driver_bsd_init,
        .deinit                 = wpa_driver_bsd_deinit,
        .get_bssid              = wpa_driver_bsd_get_bssid,
        .get_ssid               = wpa_driver_bsd_get_ssid,
-       .set_key                = wpa_driver_bsd_set_key,
        .set_countermeasures    = wpa_driver_bsd_set_countermeasures,
        .scan2                  = wpa_driver_bsd_scan,
        .get_scan_results2      = wpa_driver_bsd_get_scan_results2,
        .deauthenticate         = wpa_driver_bsd_deauthenticate,
-       .disassociate           = wpa_driver_bsd_disassociate,
        .associate              = wpa_driver_bsd_associate,
-};
-
+       .get_capa               = wpa_driver_bsd_get_capa,
 #endif /* HOSTAPD */
+       .set_freq               = bsd_set_freq,
+       .set_key                = bsd_set_key,
+       .set_ieee8021x          = bsd_set_ieee8021x,
+       .hapd_set_ssid          = bsd_set_ssid,
+       .hapd_get_ssid          = bsd_get_ssid,
+       .hapd_send_eapol        = bsd_send_eapol,
+       .set_generic_elem       = bsd_set_opt_ie,
+};