Remove the GPL notification from files contributed by Jouni Malinen
[mech_eap.git] / src / ap / ap_drv_ops.c
index 5b0a506..d07cc6b 100644 (file)
@@ -2,14 +2,8 @@
  * hostapd - Driver operations
  * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
  *
- * 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 "utils/includes.h"
 #include "utils/common.h"
 #include "drivers/driver.h"
 #include "common/ieee802_11_defs.h"
+#include "wps/wps.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
 #include "ap_config.h"
+#include "p2p_hostapd.h"
 #include "ap_drv_ops.h"
 
 
-static int hostapd_sta_flags_to_drv(int flags)
+u32 hostapd_sta_flags_to_drv(u32 flags)
 {
        int res = 0;
        if (flags & WLAN_STA_AUTHORIZED)
@@ -39,38 +35,166 @@ static int hostapd_sta_flags_to_drv(int flags)
 }
 
 
-static int hostapd_set_ap_wps_ie(struct hostapd_data *hapd,
-                                const struct wpabuf *beacon,
-                                const struct wpabuf *proberesp)
+int hostapd_build_ap_extra_ies(struct hostapd_data *hapd,
+                              struct wpabuf **beacon_ret,
+                              struct wpabuf **proberesp_ret,
+                              struct wpabuf **assocresp_ret)
 {
-       if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)
-               return 0;
-       return hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp);
+       struct wpabuf *beacon = NULL, *proberesp = NULL, *assocresp = NULL;
+       u8 buf[200], *pos;
+
+       *beacon_ret = *proberesp_ret = *assocresp_ret = NULL;
+
+       pos = buf;
+       pos = hostapd_eid_time_adv(hapd, pos);
+       if (pos != buf) {
+               if (wpabuf_resize(&beacon, pos - buf) != 0)
+                       goto fail;
+               wpabuf_put_data(beacon, buf, pos - buf);
+       }
+       pos = hostapd_eid_time_zone(hapd, pos);
+       if (pos != buf) {
+               if (wpabuf_resize(&proberesp, pos - buf) != 0)
+                       goto fail;
+               wpabuf_put_data(proberesp, buf, pos - buf);
+       }
+
+       pos = buf;
+       pos = hostapd_eid_ext_capab(hapd, pos);
+       if (pos != buf) {
+               if (wpabuf_resize(&assocresp, pos - buf) != 0)
+                       goto fail;
+               wpabuf_put_data(assocresp, buf, pos - buf);
+       }
+       pos = hostapd_eid_interworking(hapd, pos);
+       pos = hostapd_eid_adv_proto(hapd, pos);
+       pos = hostapd_eid_roaming_consortium(hapd, pos);
+       if (pos != buf) {
+               if (wpabuf_resize(&beacon, pos - buf) != 0)
+                       goto fail;
+               wpabuf_put_data(beacon, buf, pos - buf);
+
+               if (wpabuf_resize(&proberesp, pos - buf) != 0)
+                       goto fail;
+               wpabuf_put_data(proberesp, buf, pos - buf);
+       }
+
+       if (hapd->wps_beacon_ie) {
+               if (wpabuf_resize(&beacon, wpabuf_len(hapd->wps_beacon_ie)) <
+                   0)
+                       goto fail;
+               wpabuf_put_buf(beacon, hapd->wps_beacon_ie);
+       }
+
+       if (hapd->wps_probe_resp_ie) {
+               if (wpabuf_resize(&proberesp,
+                                 wpabuf_len(hapd->wps_probe_resp_ie)) < 0)
+                       goto fail;
+               wpabuf_put_buf(proberesp, hapd->wps_probe_resp_ie);
+       }
+
+#ifdef CONFIG_P2P
+       if (hapd->p2p_beacon_ie) {
+               if (wpabuf_resize(&beacon, wpabuf_len(hapd->p2p_beacon_ie)) <
+                   0)
+                       goto fail;
+               wpabuf_put_buf(beacon, hapd->p2p_beacon_ie);
+       }
+
+       if (hapd->p2p_probe_resp_ie) {
+               if (wpabuf_resize(&proberesp,
+                                 wpabuf_len(hapd->p2p_probe_resp_ie)) < 0)
+                       goto fail;
+               wpabuf_put_buf(proberesp, hapd->p2p_probe_resp_ie);
+       }
+#endif /* CONFIG_P2P */
+
+#ifdef CONFIG_P2P_MANAGER
+       if (hapd->conf->p2p & P2P_MANAGE) {
+               if (wpabuf_resize(&beacon, 100) == 0) {
+                       u8 *start, *p;
+                       start = wpabuf_put(beacon, 0);
+                       p = hostapd_eid_p2p_manage(hapd, start);
+                       wpabuf_put(beacon, p - start);
+               }
+
+               if (wpabuf_resize(&proberesp, 100) == 0) {
+                       u8 *start, *p;
+                       start = wpabuf_put(proberesp, 0);
+                       p = hostapd_eid_p2p_manage(hapd, start);
+                       wpabuf_put(proberesp, p - start);
+               }
+       }
+#endif /* CONFIG_P2P_MANAGER */
+
+#ifdef CONFIG_WPS2
+       if (hapd->conf->wps_state) {
+               struct wpabuf *a = wps_build_assoc_resp_ie();
+               if (a && wpabuf_resize(&assocresp, wpabuf_len(a)) == 0)
+                       wpabuf_put_buf(assocresp, a);
+               wpabuf_free(a);
+       }
+#endif /* CONFIG_WPS2 */
+
+#ifdef CONFIG_P2P_MANAGER
+       if (hapd->conf->p2p & P2P_MANAGE) {
+               if (wpabuf_resize(&assocresp, 100) == 0) {
+                       u8 *start, *p;
+                       start = wpabuf_put(assocresp, 0);
+                       p = hostapd_eid_p2p_manage(hapd, start);
+                       wpabuf_put(assocresp, p - start);
+               }
+       }
+#endif /* CONFIG_P2P_MANAGER */
+
+       *beacon_ret = beacon;
+       *proberesp_ret = proberesp;
+       *assocresp_ret = assocresp;
+
+       return 0;
+
+fail:
+       wpabuf_free(beacon);
+       wpabuf_free(proberesp);
+       wpabuf_free(assocresp);
+       return -1;
 }
 
 
-static int hostapd_send_mgmt_frame(struct hostapd_data *hapd, const void *msg,
-                          size_t len)
+void hostapd_free_ap_extra_ies(struct hostapd_data *hapd,
+                              struct wpabuf *beacon,
+                              struct wpabuf *proberesp,
+                              struct wpabuf *assocresp)
 {
-       if (hapd->driver == NULL || hapd->driver->send_mlme == NULL)
-               return 0;
-       return hapd->driver->send_mlme(hapd->drv_priv, msg, len);
+       wpabuf_free(beacon);
+       wpabuf_free(proberesp);
+       wpabuf_free(assocresp);
 }
 
 
-static int hostapd_send_eapol(struct hostapd_data *hapd, const u8 *addr,
-                             const u8 *data, size_t data_len, int encrypt)
+int hostapd_set_ap_wps_ie(struct hostapd_data *hapd)
 {
-       if (hapd->driver == NULL || hapd->driver->hapd_send_eapol == NULL)
+       struct wpabuf *beacon, *proberesp, *assocresp;
+       int ret;
+
+       if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)
                return 0;
-       return hapd->driver->hapd_send_eapol(hapd->drv_priv, addr, data,
-                                            data_len, encrypt,
-                                            hapd->own_addr);
+
+       if (hostapd_build_ap_extra_ies(hapd, &beacon, &proberesp, &assocresp) <
+           0)
+               return -1;
+
+       ret = hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp,
+                                         assocresp);
+
+       hostapd_free_ap_extra_ies(hapd, beacon, proberesp, assocresp);
+
+       return ret;
 }
 
 
-static int hostapd_set_authorized(struct hostapd_data *hapd,
-                                 struct sta_info *sta, int authorized)
+int hostapd_set_authorized(struct hostapd_data *hapd,
+                          struct sta_info *sta, int authorized)
 {
        if (authorized) {
                return hostapd_sta_set_flags(hapd, sta->addr,
@@ -85,39 +209,7 @@ static int hostapd_set_authorized(struct hostapd_data *hapd,
 }
 
 
-static int hostapd_set_key(const char *ifname, struct hostapd_data *hapd,
-                          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)
-{
-       if (hapd->driver == NULL || hapd->driver->set_key == NULL)
-               return 0;
-       return hapd->driver->set_key(ifname, hapd->drv_priv, alg, addr,
-                                    key_idx, set_tx, seq, seq_len, key,
-                                    key_len);
-}
-
-
-static int hostapd_read_sta_data(struct hostapd_data *hapd,
-                                struct hostap_sta_driver_data *data,
-                                const u8 *addr)
-{
-       if (hapd->driver == NULL || hapd->driver->read_sta_data == NULL)
-               return -1;
-       return hapd->driver->read_sta_data(hapd->drv_priv, data, addr);
-}
-
-
-static int hostapd_sta_clear_stats(struct hostapd_data *hapd, const u8 *addr)
-{
-       if (hapd->driver == NULL || hapd->driver->sta_clear_stats == NULL)
-               return 0;
-       return hapd->driver->sta_clear_stats(hapd->drv_priv, addr);
-}
-
-
-static int hostapd_set_sta_flags(struct hostapd_data *hapd,
-                                struct sta_info *sta)
+int hostapd_set_sta_flags(struct hostapd_data *hapd, struct sta_info *sta)
 {
        int set_flags, total_flags, flags_and, flags_or;
        total_flags = hostapd_sta_flags_to_drv(sta->flags);
@@ -133,8 +225,8 @@ static int hostapd_set_sta_flags(struct hostapd_data *hapd,
 }
 
 
-static int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd,
-                                    const char *ifname, int enabled)
+int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd, const char *ifname,
+                             int enabled)
 {
        struct wpa_bss_params params;
        os_memset(&params, 0, sizeof(params));
@@ -147,166 +239,80 @@ static int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd,
                params.wpa_pairwise = hapd->conf->wpa_pairwise;
                params.wpa_key_mgmt = hapd->conf->wpa_key_mgmt;
                params.rsn_preauth = hapd->conf->rsn_preauth;
+#ifdef CONFIG_IEEE80211W
+               params.ieee80211w = hapd->conf->ieee80211w;
+#endif /* CONFIG_IEEE80211W */
        }
        return hostapd_set_ieee8021x(hapd, &params);
 }
 
 
-static int hostapd_set_radius_acl_auth(struct hostapd_data *hapd,
-                                      const u8 *mac, int accepted,
-                                      u32 session_timeout)
-{
-       if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
-               return 0;
-       return hapd->driver->set_radius_acl_auth(hapd->drv_priv, mac, accepted,
-                                                session_timeout);
-}
-
-
-static int hostapd_set_radius_acl_expire(struct hostapd_data *hapd,
-                                        const u8 *mac)
-{
-       if (hapd->driver == NULL ||
-           hapd->driver->set_radius_acl_expire == NULL)
-               return 0;
-       return hapd->driver->set_radius_acl_expire(hapd->drv_priv, mac);
-}
-
-
-static int hostapd_set_bss_params(struct hostapd_data *hapd,
-                                 int use_protection)
-{
-       int ret = 0;
-       int preamble;
-#ifdef CONFIG_IEEE80211N
-       u8 buf[60], *ht_capab, *ht_oper, *pos;
-
-       pos = buf;
-       ht_capab = pos;
-       pos = hostapd_eid_ht_capabilities(hapd, pos);
-       ht_oper = pos;
-       pos = hostapd_eid_ht_operation(hapd, pos);
-       if (pos > ht_oper && ht_oper > ht_capab &&
-           hostapd_set_ht_params(hapd, ht_capab + 2, ht_capab[1],
-                                 ht_oper + 2, ht_oper[1])) {
-               wpa_printf(MSG_ERROR, "Could not set HT capabilities "
-                          "for kernel driver");
-               ret = -1;
-       }
-
-#endif /* CONFIG_IEEE80211N */
-
-       if (hostapd_set_cts_protect(hapd, use_protection)) {
-               wpa_printf(MSG_ERROR, "Failed to set CTS protect in kernel "
-                          "driver");
-               ret = -1;
-       }
-
-       if (hapd->iface->current_mode &&
-           hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G &&
-           hostapd_set_short_slot_time(hapd,
-                                       hapd->iface->num_sta_no_short_slot_time
-                                       > 0 ? 0 : 1)) {
-               wpa_printf(MSG_ERROR, "Failed to set Short Slot Time option "
-                          "in kernel driver");
-               ret = -1;
-       }
-
-       if (hapd->iface->num_sta_no_short_preamble == 0 &&
-           hapd->iconf->preamble == SHORT_PREAMBLE)
-               preamble = SHORT_PREAMBLE;
-       else
-               preamble = LONG_PREAMBLE;
-       if (hostapd_set_preamble(hapd, preamble)) {
-               wpa_printf(MSG_ERROR, "Could not set preamble for kernel "
-                          "driver");
-               ret = -1;
-       }
-
-       return ret;
-}
-
-
-static int hostapd_set_beacon(struct hostapd_data *hapd,
-                             const u8 *head, size_t head_len,
-                             const u8 *tail, size_t tail_len, int dtim_period,
-                             int beacon_int)
-{
-       if (hapd->driver == NULL || hapd->driver->set_beacon == NULL)
-               return 0;
-       return hapd->driver->set_beacon(hapd->drv_priv,
-                                       head, head_len, tail, tail_len,
-                                       dtim_period, beacon_int);
-}
-
-
-static int hostapd_vlan_if_add(struct hostapd_data *hapd, const char *ifname)
+int hostapd_vlan_if_add(struct hostapd_data *hapd, const char *ifname)
 {
        char force_ifname[IFNAMSIZ];
        u8 if_addr[ETH_ALEN];
-       return hostapd_if_add(hapd, WPA_IF_AP_VLAN, ifname, NULL, NULL, NULL,
-                             force_ifname, if_addr);
+       return hostapd_if_add(hapd, WPA_IF_AP_VLAN, ifname, hapd->own_addr,
+                             NULL, NULL, force_ifname, if_addr, NULL);
 }
 
-static int hostapd_vlan_if_remove(struct hostapd_data *hapd,
-                                 const char *ifname)
+
+int hostapd_vlan_if_remove(struct hostapd_data *hapd, const char *ifname)
 {
        return hostapd_if_remove(hapd, WPA_IF_AP_VLAN, ifname);
 }
 
 
-static int hostapd_set_wds_sta(struct hostapd_data *hapd, const u8 *addr,
-                              int aid, int val)
+int hostapd_set_wds_sta(struct hostapd_data *hapd, const u8 *addr, int aid,
+                       int val)
 {
-       if (hapd->driver == NULL || hapd->driver->set_wds_sta == NULL)
-               return 0;
-       return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val);
-}
+       const char *bridge = NULL;
 
-
-static int hostapd_set_sta_vlan(const char *ifname, struct hostapd_data *hapd,
-                               const u8 *addr, int vlan_id)
-{
-       if (hapd->driver == NULL || hapd->driver->set_sta_vlan == NULL)
+       if (hapd->driver == NULL || hapd->driver->set_wds_sta == NULL)
                return 0;
-       return hapd->driver->set_sta_vlan(hapd->drv_priv, addr, ifname,
-                                         vlan_id);
+       if (hapd->conf->wds_bridge[0])
+               bridge = hapd->conf->wds_bridge;
+       else if (hapd->conf->bridge[0])
+               bridge = hapd->conf->bridge;
+       return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val,
+                                        bridge);
 }
 
 
-static int hostapd_get_inact_sec(struct hostapd_data *hapd, const u8 *addr)
+int hostapd_add_sta_node(struct hostapd_data *hapd, const u8 *addr,
+                        u16 auth_alg)
 {
-       if (hapd->driver == NULL || hapd->driver->get_inact_sec == NULL)
+       if (hapd->driver == NULL || hapd->driver->add_sta_node == NULL)
                return 0;
-       return hapd->driver->get_inact_sec(hapd->drv_priv, addr);
+       return hapd->driver->add_sta_node(hapd->drv_priv, addr, auth_alg);
 }
 
 
-static int hostapd_sta_deauth(struct hostapd_data *hapd, const u8 *addr,
-                             int reason)
+int hostapd_sta_auth(struct hostapd_data *hapd, const u8 *addr,
+                    u16 seq, u16 status, const u8 *ie, size_t len)
 {
-       if (hapd->driver == NULL || hapd->driver->sta_deauth == NULL)
+       if (hapd->driver == NULL || hapd->driver->sta_auth == NULL)
                return 0;
-       return hapd->driver->sta_deauth(hapd->drv_priv, hapd->own_addr, addr,
-                                       reason);
+       return hapd->driver->sta_auth(hapd->drv_priv, hapd->own_addr, addr,
+                                     seq, status, ie, len);
 }
 
 
-static int hostapd_sta_disassoc(struct hostapd_data *hapd, const u8 *addr,
-                               int reason)
+int hostapd_sta_assoc(struct hostapd_data *hapd, const u8 *addr,
+                     int reassoc, u16 status, const u8 *ie, size_t len)
 {
-       if (hapd->driver == NULL || hapd->driver->sta_disassoc == NULL)
+       if (hapd->driver == NULL || hapd->driver->sta_assoc == NULL)
                return 0;
-       return hapd->driver->sta_disassoc(hapd->drv_priv, hapd->own_addr, addr,
-                                         reason);
+       return hapd->driver->sta_assoc(hapd->drv_priv, hapd->own_addr, addr,
+                                      reassoc, status, ie, len);
 }
 
 
-static int hostapd_sta_add(struct hostapd_data *hapd,
-                          const u8 *addr, u16 aid, u16 capability,
-                          const u8 *supp_rates, size_t supp_rates_len,
-                          u16 listen_interval,
-                          const struct ieee80211_ht_capabilities *ht_capab)
+int hostapd_sta_add(struct hostapd_data *hapd,
+                   const u8 *addr, u16 aid, u16 capability,
+                   const u8 *supp_rates, size_t supp_rates_len,
+                   u16 listen_interval,
+                   const struct ieee80211_ht_capabilities *ht_capab,
+                   u32 flags, u8 qosinfo)
 {
        struct hostapd_sta_add_params params;
 
@@ -323,52 +329,19 @@ static int hostapd_sta_add(struct hostapd_data *hapd,
        params.supp_rates_len = supp_rates_len;
        params.listen_interval = listen_interval;
        params.ht_capabilities = ht_capab;
+       params.flags = hostapd_sta_flags_to_drv(flags);
+       params.qosinfo = qosinfo;
        return hapd->driver->sta_add(hapd->drv_priv, &params);
 }
 
 
-static int hostapd_sta_remove(struct hostapd_data *hapd, const u8 *addr)
+int hostapd_add_tspec(struct hostapd_data *hapd, const u8 *addr,
+                     u8 *tspec_ie, size_t tspec_ielen)
 {
-       if (hapd->driver == NULL || hapd->driver->sta_remove == NULL)
+       if (hapd->driver == NULL || hapd->driver->add_tspec == NULL)
                return 0;
-       return hapd->driver->sta_remove(hapd->drv_priv, addr);
-}
-
-
-static int hostapd_set_countermeasures(struct hostapd_data *hapd, int enabled)
-{
-       if (hapd->driver == NULL ||
-           hapd->driver->hapd_set_countermeasures == NULL)
-               return 0;
-       return hapd->driver->hapd_set_countermeasures(hapd->drv_priv, enabled);
-}
-
-
-void hostapd_set_driver_ops(struct hostapd_driver_ops *ops)
-{
-       ops->set_ap_wps_ie = hostapd_set_ap_wps_ie;
-       ops->send_mgmt_frame = hostapd_send_mgmt_frame;
-       ops->send_eapol = hostapd_send_eapol;
-       ops->set_authorized = hostapd_set_authorized;
-       ops->set_key = hostapd_set_key;
-       ops->read_sta_data = hostapd_read_sta_data;
-       ops->sta_clear_stats = hostapd_sta_clear_stats;
-       ops->set_sta_flags = hostapd_set_sta_flags;
-       ops->set_drv_ieee8021x = hostapd_set_drv_ieee8021x;
-       ops->set_radius_acl_auth = hostapd_set_radius_acl_auth;
-       ops->set_radius_acl_expire = hostapd_set_radius_acl_expire;
-       ops->set_bss_params = hostapd_set_bss_params;
-       ops->set_beacon = hostapd_set_beacon;
-       ops->vlan_if_add = hostapd_vlan_if_add;
-       ops->vlan_if_remove = hostapd_vlan_if_remove;
-       ops->set_wds_sta = hostapd_set_wds_sta;
-       ops->set_sta_vlan = hostapd_set_sta_vlan;
-       ops->get_inact_sec = hostapd_get_inact_sec;
-       ops->sta_deauth = hostapd_sta_deauth;
-       ops->sta_disassoc = hostapd_sta_disassoc;
-       ops->sta_add = hostapd_sta_add;
-       ops->sta_remove = hostapd_sta_remove;
-       ops->set_countermeasures = hostapd_set_countermeasures;
+       return hapd->driver->add_tspec(hapd->drv_priv, addr, tspec_ie,
+                                      tspec_ielen);
 }
 
 
@@ -407,12 +380,14 @@ int hostapd_set_ssid(struct hostapd_data *hapd, const u8 *buf, size_t len)
 
 int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,
                   const char *ifname, const u8 *addr, void *bss_ctx,
-                  void **drv_priv, char *force_ifname, u8 *if_addr)
+                  void **drv_priv, char *force_ifname, u8 *if_addr,
+                  const char *bridge)
 {
        if (hapd->driver == NULL || hapd->driver->if_add == NULL)
                return -1;
        return hapd->driver->if_add(hapd->drv_priv, type, ifname, addr,
-                                   bss_ctx, drv_priv, force_ifname, if_addr);
+                                   bss_ctx, drv_priv, force_ifname, if_addr,
+                                   bridge);
 }
 
 
@@ -495,16 +470,6 @@ int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
 }
 
 
-int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
-                         int *basic_rates, int mode)
-{
-       if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)
-               return 0;
-       return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates,
-                                          basic_rates, mode);
-}
-
-
 int hostapd_set_country(struct hostapd_data *hapd, const char *country)
 {
        if (hapd->driver == NULL ||
@@ -514,30 +479,6 @@ int hostapd_set_country(struct hostapd_data *hapd, const char *country)
 }
 
 
-int hostapd_set_cts_protect(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_cts_protect == NULL)
-               return 0;
-       return hapd->driver->set_cts_protect(hapd->drv_priv, value);
-}
-
-
-int hostapd_set_preamble(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_preamble == NULL)
-               return 0;
-       return hapd->driver->set_preamble(hapd->drv_priv, value);
-}
-
-
-int hostapd_set_short_slot_time(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_short_slot_time == NULL)
-               return 0;
-       return hapd->driver->set_short_slot_time(hapd->drv_priv, value);
-}
-
-
 int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
                                int cw_min, int cw_max, int burst_time)
 {
@@ -548,15 +489,6 @@ int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
 }
 
 
-int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
-                          const u8 *mask)
-{
-       if (hapd->driver == NULL || hapd->driver->valid_bss_mask == NULL)
-               return 1;
-       return hapd->driver->valid_bss_mask(hapd->drv_priv, addr, mask);
-}
-
-
 struct hostapd_hw_modes *
 hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
                            u16 *flags)
@@ -577,19 +509,6 @@ int hostapd_driver_commit(struct hostapd_data *hapd)
 }
 
 
-int hostapd_set_ht_params(struct hostapd_data *hapd,
-                         const u8 *ht_capab, size_t ht_capab_len,
-                         const u8 *ht_oper, size_t ht_oper_len)
-{
-       if (hapd->driver == NULL || hapd->driver->set_ht_params == NULL ||
-           ht_capab == NULL || ht_oper == NULL)
-               return 0;
-       return hapd->driver->set_ht_params(hapd->drv_priv,
-                                          ht_capab, ht_capab_len,
-                                          ht_oper, ht_oper_len);
-}
-
-
 int hostapd_drv_none(struct hostapd_data *hapd)
 {
        return hapd->driver && os_strcmp(hapd->driver->name, "none") == 0;
@@ -612,3 +531,56 @@ struct wpa_scan_results * hostapd_driver_get_scan_results(
                return hapd->driver->get_scan_results2(hapd->drv_priv);
        return NULL;
 }
+
+
+int hostapd_driver_set_noa(struct hostapd_data *hapd, u8 count, int start,
+                          int duration)
+{
+       if (hapd->driver && hapd->driver->set_noa)
+               return hapd->driver->set_noa(hapd->drv_priv, count, start,
+                                            duration);
+       return -1;
+}
+
+
+int hostapd_drv_set_key(const char *ifname, struct hostapd_data *hapd,
+                       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)
+{
+       if (hapd->driver == NULL || hapd->driver->set_key == NULL)
+               return 0;
+       return hapd->driver->set_key(ifname, hapd->drv_priv, alg, addr,
+                                    key_idx, set_tx, seq, seq_len, key,
+                                    key_len);
+}
+
+
+int hostapd_drv_send_mlme(struct hostapd_data *hapd,
+                         const void *msg, size_t len, int noack)
+{
+       if (hapd->driver == NULL || hapd->driver->send_mlme == NULL)
+               return 0;
+       return hapd->driver->send_mlme(hapd->drv_priv, msg, len, noack);
+}
+
+
+int hostapd_drv_sta_deauth(struct hostapd_data *hapd,
+                          const u8 *addr, int reason)
+{
+       if (hapd->driver == NULL || hapd->driver->sta_deauth == NULL)
+               return 0;
+       return hapd->driver->sta_deauth(hapd->drv_priv, hapd->own_addr, addr,
+                                       reason);
+}
+
+
+int hostapd_drv_sta_disassoc(struct hostapd_data *hapd,
+                            const u8 *addr, int reason)
+{
+       if (hapd->driver == NULL || hapd->driver->sta_disassoc == NULL)
+               return 0;
+       return hapd->driver->sta_disassoc(hapd->drv_priv, hapd->own_addr, addr,
+                                         reason);
+}