]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - src/drivers/driver_bsd.c
driver_bsd.c: Reduce code duplication (ifflag)
[thirdparty/hostap.git] / src / drivers / driver_bsd.c
index c3cbd096c7a0e0bdcc6db51025d521bfdd9b9275..2cb5876af018d7afa774f0cf5495d7c7ca5d7dcd 100644 (file)
@@ -22,6 +22,7 @@
 #include "common/ieee802_11_defs.h"
 
 #include <net/if.h>
+#include <net/if_media.h>
 
 #ifdef __NetBSD__
 #include <net/if_ether.h>
@@ -35,8 +36,8 @@
 #include <netproto/802_11/ieee80211_dragonfly.h>
 #else /* __DragonFly__ */
 #include <net80211/ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
 #include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211_crypto.h>
 #endif /* __DragonFly__ */
 #if __FreeBSD__
 #include <net80211/ieee80211_freebsd.h>
@@ -142,6 +143,115 @@ bsd_set_ssid(int s, const char *ifname, const u8 *ssid, size_t ssid_len)
 #endif
 }
 
+static int
+bsd_get_if_media(int s, const char *ifname)
+{
+       struct ifmediareq ifmr;
+
+       os_memset(&ifmr, 0, sizeof(ifmr));
+       os_strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
+
+       if (ioctl(s, SIOCGIFMEDIA, &ifmr) < 0) {
+               wpa_printf(MSG_ERROR, "%s: SIOCGIFMEDIA %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
+       return ifmr.ifm_current;
+}
+
+static int
+bsd_set_if_media(int s, const char *ifname, int media)
+{
+       struct ifreq ifr;
+
+       os_memset(&ifr, 0, sizeof(ifr));
+       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       ifr.ifr_media = media;
+
+       if (ioctl(s, SIOCSIFMEDIA, &ifr) < 0) {
+               wpa_printf(MSG_ERROR, "%s: SIOCSIFMEDIA %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
+       return 0;
+}
+
+static int
+bsd_set_mediaopt(int s, const char *ifname, uint32_t mask, uint32_t mode)
+{
+       int media = bsd_get_if_media(s, ifname);
+
+       if (media < 0)
+               return -1;
+       media &= ~mask;
+       media |= mode;
+       if (bsd_set_if_media(s, ifname, media) < 0)
+               return -1;
+       return 0;
+}
+
+static int
+bsd_del_key(int s, const char *ifname, const u8 *addr, int key_idx)
+{
+       struct ieee80211req_del_key wk;
+
+       os_memset(&wk, 0, sizeof(wk));
+       if (addr == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: key_idx=%d", __func__, key_idx);
+               wk.idk_keyix = key_idx;
+       } else {
+               wpa_printf(MSG_DEBUG, "%s: addr=" MACSTR, __func__,
+                          MAC2STR(addr));
+               os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
+               wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */
+       }
+
+       return bsd_set80211var(s, ifname, 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)
+{
+       struct ieee80211req_mlme mlme;
+
+       os_memset(&mlme, 0, sizeof(mlme));
+       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));
+}
+
+static int
+bsd_ctrl_iface(int s, const char *ifname, int enable)
+{
+       struct ifreq ifr;
+
+       os_memset(&ifr, 0, sizeof(ifr));
+       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+
+       if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+               perror("ioctl[SIOCGIFFLAGS]");
+               return -1;
+       }
+
+       if (enable)
+               ifr.ifr_flags |= IFF_UP;
+       else
+               ifr.ifr_flags &= ~IFF_UP;
+
+       if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
+               perror("ioctl[SIOCSIFFLAGS]");
+               return -1;
+       }
+
+       return 0;
+}
+
 
 #ifdef HOSTAPD
 
@@ -284,37 +394,10 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        return 0;
 }
 
-
 static int
-bsd_set_iface_flags(void *priv, int dev_up)
+hostapd_bsd_ctrl_iface(struct bsd_driver_data *drv, int enable)
 {
-       struct bsd_driver_data *drv = priv;
-       struct ifreq ifr;
-
-       wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up);
-
-       if (drv->ioctl_sock < 0)
-               return -1;
-
-       memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
-
-       if (ioctl(drv->ioctl_sock, SIOCGIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCGIFFLAGS]");
-               return -1;
-       }
-
-       if (dev_up)
-               ifr.ifr_flags |= IFF_UP;
-       else
-               ifr.ifr_flags &= ~IFF_UP;
-
-       if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCSIFFLAGS]");
-               return -1;
-       }
-
-       return 0;
+       return bsd_ctrl_iface(drv->ioctl_sock, drv->iface, enable);
 }
 
 static int
@@ -345,7 +428,7 @@ bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
                        HOSTAPD_LEVEL_WARNING, "Error enabling WPA/802.1X!");
                return -1;
        }
-       return bsd_set_iface_flags(priv, 1);
+       return hostapd_bsd_ctrl_iface(drv, 1);
 }
 
 static int
@@ -362,18 +445,10 @@ static int
 bsd_set_sta_authorized(void *priv, const u8 *addr, int authorized)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s: addr=%s authorized=%d",
-                  __func__, ether_sprintf(addr), authorized);
-
-       if (authorized)
-               mlme.im_op = IEEE80211_MLME_AUTHORIZE;
-       else
-               mlme.im_op = IEEE80211_MLME_UNAUTHORIZE;
-       mlme.im_reason = 0;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface, authorized ?
+                                  IEEE80211_MLME_AUTHORIZE :
+                                  IEEE80211_MLME_UNAUTHORIZE, 0, addr);
 }
 
 static int
@@ -389,27 +464,7 @@ bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags, int flags_or,
 }
 
 static int
-bsd_del_key(void *priv, const u8 *addr, int key_idx)
-{
-       struct bsd_driver_data *drv = priv;
-       struct ieee80211req_del_key wk;
-
-       wpa_printf(MSG_DEBUG, "%s: addr=%s key_idx=%d",
-                  __func__, ether_sprintf(addr), key_idx);
-
-       memset(&wk, 0, sizeof(wk));
-       if (addr != NULL) {
-               memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
-               wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */
-       } else {
-               wk.idk_keyix = key_idx;
-       }
-
-       return set80211var(drv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk));
-}
-
-static int
-bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
+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)
 {
@@ -418,7 +473,7 @@ bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
        u_int8_t cipher;
 
        if (alg == WPA_ALG_NONE)
-               return bsd_del_key(drv, addr, key_idx);
+               return bsd_del_key(drv->ioctl_sock, drv->iface, addr, key_idx);
 
        wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%s key_idx=%d",
                   __func__, alg, ether_sprintf(addr), key_idx);
@@ -542,15 +597,9 @@ static int
 bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr, int reason_code)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s: addr=%s reason_code=%d",
-                  __func__, ether_sprintf(addr), reason_code);
-
-       mlme.im_op = IEEE80211_MLME_DEAUTH;
-       mlme.im_reason = reason_code;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
+                                  IEEE80211_MLME_DEAUTH, reason_code, addr);
 }
 
 static int
@@ -558,18 +607,12 @@ bsd_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
                 int reason_code)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
-
-       wpa_printf(MSG_DEBUG, "%s: addr=%s reason_code=%d",
-                  __func__, ether_sprintf(addr), reason_code);
 
-       mlme.im_op = IEEE80211_MLME_DISASSOC;
-       mlme.im_reason = reason_code;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
+                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
 }
 
-static int
+static void
 bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
 {
        struct hostapd_data *hapd = drv->hapd;
@@ -594,7 +637,7 @@ bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
                ielen += 2;
 
 no_ie:
-       return hostapd_notif_assoc(hapd, addr, iebuf, ielen);
+       drv_event_assoc(hapd, addr, iebuf, ielen);
 }
 
 static void
@@ -634,7 +677,7 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
                        break;
                case RTM_IEEE80211_LEAVE:
                        leave = (struct ieee80211_leave_event *) &ifan[1];
-                       hostapd_notif_disassoc(drv->hapd, leave->iev_addr);
+                       drv_event_disassoc(drv->hapd, leave->iev_addr);
                        break;
                case RTM_IEEE80211_JOIN:
 #ifdef RTM_IEEE80211_REJOIN
@@ -696,39 +739,35 @@ 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;
-       unsigned char buf[3000];
-       unsigned char *bp = buf;
+       unsigned char *bp;
        struct l2_ethhdr *eth;
        size_t len;
        int status;
 
        /*
-        * Prepend the Etherent header.  If the caller left us
+        * Prepend the Ethernet header.  If the caller left us
         * space at the front we could just insert it but since
         * we don't know we copy to a local buffer.  Given the frequency
         * and size of frames this probably doesn't matter.
         */
        len = data_len + sizeof(struct l2_ethhdr);
-       if (len > sizeof(buf)) {
-               bp = malloc(len);
-               if (bp == NULL) {
-                       printf("EAPOL frame discarded, cannot malloc temp "
-                              "buffer of size %u!\n", (unsigned int) len);
-                       return -1;
-               }
+       bp = os_zalloc(len);
+       if (bp == NULL) {
+               wpa_printf(MSG_ERROR, "malloc() failed for bsd_send_eapol"
+                          "(len=%lu)", (unsigned long) len);
+               return -1;
        }
        eth = (struct l2_ethhdr *) bp;
-       memcpy(eth->h_dest, addr, ETH_ALEN);
-       memcpy(eth->h_source, own_addr, ETH_ALEN);
+       os_memcpy(eth->h_dest, addr, ETH_ALEN);
+       os_memcpy(eth->h_source, own_addr, ETH_ALEN);
        eth->h_proto = htons(ETH_P_EAPOL);
-       memcpy(eth+1, data, data_len);
+       os_memcpy(eth + 1, data, data_len);
 
        wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", bp, len);
 
        status = l2_packet_send(drv->sock_xmit, addr, ETH_P_EAPOL, bp, len);
 
-       if (bp != buf)
-               free(bp);
+       os_free(bp);
        return status;
 }
 
@@ -736,9 +775,8 @@ static void
 handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
 {
        struct bsd_driver_data *drv = ctx;
-       hostapd_eapol_receive(drv->hapd, src_addr,
-                             buf + sizeof(struct l2_ethhdr),
-                             len - sizeof(struct l2_ethhdr));
+       drv_event_eapol_rx(drv->hapd, src_addr, buf + sizeof(struct l2_ethhdr),
+                          len - sizeof(struct l2_ethhdr));
 }
 
 static int
@@ -763,6 +801,32 @@ hostapd_bsd_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
        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)
 {
@@ -789,10 +853,19 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
        if (l2_packet_get_own_addr(drv->sock_xmit, params->own_addr))
                goto bad;
 
-       bsd_set_iface_flags(drv, 0);    /* mark down during setup */
+       /* mark down during setup */
+       if (hostapd_bsd_ctrl_iface(drv, 0) < 0)
+               goto bad;
        if (bsd_wireless_event_init(drv))
                goto bad;
 
+       if (bsd_set_mediaopt(drv->ioctl_sock, drv->iface, IFM_OMASK,
+                            IFM_IEEE80211_HOSTAP) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
+               goto bad;
+       }
+
        return drv;
 bad:
        if (drv->sock_xmit != NULL)
@@ -800,7 +873,7 @@ bad:
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv != NULL)
-               free(drv);
+               os_free(drv);
        return NULL;
 }
 
@@ -811,12 +884,12 @@ bsd_deinit(void *priv)
        struct bsd_driver_data *drv = priv;
 
        bsd_wireless_event_deinit(drv);
-       (void) bsd_set_iface_flags(drv, 0);
+       hostapd_bsd_ctrl_iface(drv, 0);
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv->sock_xmit != NULL)
                l2_packet_deinit(drv->sock_xmit);
-       free(drv);
+       os_free(drv);
 }
 
 const struct wpa_driver_ops wpa_driver_bsd_ops = {
@@ -836,6 +909,7 @@ const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .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 */
@@ -886,36 +960,6 @@ get80211param(struct wpa_driver_bsd_data *drv, int op)
        return ireq.i_val;
 }
 
-static int
-getifflags(struct wpa_driver_bsd_data *drv, int *flags)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
-       if (ioctl(drv->sock, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
-               perror("SIOCGIFFLAGS");
-               return errno;
-       }
-       *flags = ifr.ifr_flags & 0xffff;
-       return 0;
-}
-
-static int
-setifflags(struct wpa_driver_bsd_data *drv, int flags)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
-       ifr.ifr_flags = flags & 0xffff;
-       if (ioctl(drv->sock, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-               perror("SIOCSIFFLAGS");
-               return errno;
-       }
-       return 0;
-}
-
 static int
 wpa_driver_bsd_get_bssid(void *priv, u8 *bssid)
 {
@@ -966,7 +1010,11 @@ static int
 wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_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);
+#else /* IEEE80211_IOC_APPIE */
        return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len);
+#endif /* IEEE80211_IOC_APPIE */
 }
 
 static int
@@ -997,30 +1045,7 @@ wpa_driver_bsd_set_wpa(void *priv, int enabled)
 }
 
 static int
-wpa_driver_bsd_del_key(struct wpa_driver_bsd_data *drv, int key_idx,
-                      const unsigned char *addr)
-{
-       struct ieee80211req_del_key wk;
-
-       os_memset(&wk, 0, sizeof(wk));
-       if (addr != NULL &&
-           bcmp(addr, "\xff\xff\xff\xff\xff\xff", IEEE80211_ADDR_LEN) != 0) {
-               struct ether_addr ea;
-
-               os_memcpy(&ea, addr, IEEE80211_ADDR_LEN);
-               wpa_printf(MSG_DEBUG, "%s: addr=%s keyidx=%d",
-                       __func__, ether_ntoa(&ea), key_idx);
-               os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
-               wk.idk_keyix = (uint8_t) IEEE80211_KEYIX_NONE;
-       } else {
-               wpa_printf(MSG_DEBUG, "%s: keyidx=%d", __func__, key_idx);
-               wk.idk_keyix = key_idx;
-       }
-       return set80211var(drv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk));
-}
-
-static int
-wpa_driver_bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
+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)
@@ -1032,7 +1057,10 @@ wpa_driver_bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
        u_int8_t cipher;
 
        if (alg == WPA_ALG_NONE)
-               return wpa_driver_bsd_del_key(drv, key_idx, addr);
+               return bsd_del_key(drv->sock, drv->ifname,
+                                  os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
+                                  IEEE80211_ADDR_LEN) == 0 ? NULL : addr,
+                                  key_idx);
 
        switch (alg) {
        case WPA_ALG_WEP:
@@ -1119,28 +1147,18 @@ static int
 wpa_driver_bsd_deauthenticate(void *priv, const u8 *addr, int reason_code)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s", __func__);
-       os_memset(&mlme, 0, sizeof(mlme));
-       mlme.im_op = IEEE80211_MLME_DEAUTH;
-       mlme.im_reason = reason_code;
-       os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       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;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s", __func__);
-       os_memset(&mlme, 0, sizeof(mlme));
-       mlme.im_op = IEEE80211_MLME_DISASSOC;
-       mlme.im_reason = reason_code;
-       os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->sock, drv->ifname,
+                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
 }
 
 static int
@@ -1149,10 +1167,10 @@ wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
        struct wpa_driver_bsd_data *drv = priv;
        int authmode;
 
-       if ((auth_alg & AUTH_ALG_OPEN_SYSTEM) &&
-           (auth_alg & AUTH_ALG_SHARED_KEY))
+       if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
+           (auth_alg & WPA_AUTH_ALG_SHARED))
                authmode = IEEE80211_AUTH_AUTO;
-       else if (auth_alg & AUTH_ALG_SHARED_KEY)
+       else if (auth_alg & WPA_AUTH_ALG_SHARED)
                authmode = IEEE80211_AUTH_SHARED;
        else
                authmode = IEEE80211_AUTH_OPEN;
@@ -1213,16 +1231,21 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
        return ret;
 }
 
+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;
-       int flags;
        const u8 *ssid = params->ssids[0].ssid;
        size_t ssid_len = params->ssids[0].ssid_len;
 
        /* NB: interface must be marked UP to do a scan */
-       if (getifflags(drv, &flags) != 0 || setifflags(drv, flags | IFF_UP) != 0)
+       if (wpa_driver_bsd_ctrl_iface(drv, 1) < 0)
                return -1;
 
        /* set desired ssid before scan */
@@ -1466,6 +1489,13 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
                        __func__, strerror(errno));
                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));
@@ -1493,14 +1523,12 @@ static void
 wpa_driver_bsd_deinit(void *priv)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       int flags;
 
        wpa_driver_bsd_set_wpa(drv, 0);
        eloop_unregister_read_sock(drv->route);
 
        /* NB: mark interface down */
-       if (getifflags(drv, &flags) == 0)
-               (void) setifflags(drv, flags &~ IFF_UP);
+       wpa_driver_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)