]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - wpa_supplicant/driver_i.h
DBus: Add "sae" to interface key_mgmt capabilities
[thirdparty/hostap.git] / wpa_supplicant / driver_i.h
index 00703d906860328f4505ca7cf2547e137e398c5b..45b62bdea28589e2dc4518ce3a1c0b5a2a4bb719 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * wpa_supplicant - Internal driver interface wrappers
- * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2015, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -65,21 +65,55 @@ static inline int wpa_drv_associate(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_init_mesh(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->init_mesh)
+               return wpa_s->driver->init_mesh(wpa_s->drv_priv);
+       return -1;
+}
+
+static inline int wpa_drv_join_mesh(struct wpa_supplicant *wpa_s,
+                                   struct wpa_driver_mesh_join_params *params)
+{
+       if (wpa_s->driver->join_mesh)
+               return wpa_s->driver->join_mesh(wpa_s->drv_priv, params);
+       return -1;
+}
+
+static inline int wpa_drv_leave_mesh(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->leave_mesh)
+               return wpa_s->driver->leave_mesh(wpa_s->drv_priv);
+       return -1;
+}
+
+static inline int wpa_drv_mesh_link_probe(struct wpa_supplicant *wpa_s,
+                                         const u8 *addr,
+                                         const u8 *eth, size_t len)
+{
+       if (wpa_s->driver->probe_mesh_link)
+               return wpa_s->driver->probe_mesh_link(wpa_s->drv_priv, addr,
+                                                     eth, len);
+       return -1;
+}
+
 static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
                               struct wpa_driver_scan_params *params)
 {
+#ifdef CONFIG_TESTING_OPTIONS
+       if (wpa_s->test_failure == WPAS_TEST_FAILURE_SCAN_TRIGGER)
+               return -EBUSY;
+#endif /* CONFIG_TESTING_OPTIONS */
        if (wpa_s->driver->scan2)
                return wpa_s->driver->scan2(wpa_s->drv_priv, params);
        return -1;
 }
 
 static inline int wpa_drv_sched_scan(struct wpa_supplicant *wpa_s,
-                                    struct wpa_driver_scan_params *params,
-                                    u32 interval)
+                                    struct wpa_driver_scan_params *params)
 {
        if (wpa_s->driver->sched_scan)
-               return wpa_s->driver->sched_scan(wpa_s->drv_priv,
-                                                params, interval);
+               return wpa_s->driver->sched_scan(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -90,13 +124,8 @@ static inline int wpa_drv_stop_sched_scan(struct wpa_supplicant *wpa_s)
        return -1;
 }
 
-static inline struct wpa_scan_results * wpa_drv_get_scan_results2(
-       struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_scan_results2)
-               return wpa_s->driver->get_scan_results2(wpa_s->drv_priv);
-       return NULL;
-}
+struct wpa_scan_results *
+wpa_drv_get_scan_results2(struct wpa_supplicant *wpa_s);
 
 static inline int wpa_drv_get_bssid(struct wpa_supplicant *wpa_s, u8 *bssid)
 {
@@ -118,8 +147,23 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
                                  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)
-{
+                                 const u8 *key, size_t key_len,
+                                 enum key_flag key_flag)
+{
+       struct wpa_driver_set_key_params params;
+
+       os_memset(&params, 0, sizeof(params));
+       params.ifname = wpa_s->ifname;
+       params.alg = alg;
+       params.addr = addr;
+       params.key_idx = key_idx;
+       params.set_tx = set_tx;
+       params.seq = seq;
+       params.seq_len = seq_len;
+       params.key = key;
+       params.key_len = key_len;
+       params.key_flag = key_flag;
+
        if (alg != WPA_ALG_NONE) {
                if (key_idx >= 0 && key_idx <= 6)
                        wpa_s->keys_cleared &= ~BIT(key_idx);
@@ -127,15 +171,22 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
                        wpa_s->keys_cleared = 0;
        }
        if (wpa_s->driver->set_key) {
-               return wpa_s->driver->set_key(wpa_s->ifname, wpa_s->drv_priv,
-                                             alg, addr, key_idx, set_tx,
-                                             seq, seq_len, key, key_len);
+               return wpa_s->driver->set_key(wpa_s->drv_priv, &params);
        }
        return -1;
 }
 
+static inline int wpa_drv_get_seqnum(struct wpa_supplicant *wpa_s,
+                                    const u8 *addr, int idx, u8 *seq)
+{
+       if (wpa_s->driver->get_seqnum)
+               return wpa_s->driver->get_seqnum(wpa_s->ifname, wpa_s->drv_priv,
+                                                addr, idx, seq);
+       return -1;
+}
+
 static inline int wpa_drv_sta_deauth(struct wpa_supplicant *wpa_s,
-                                    const u8 *addr, int reason_code)
+                                    const u8 *addr, u16 reason_code)
 {
        if (wpa_s->driver->sta_deauth) {
                return wpa_s->driver->sta_deauth(wpa_s->drv_priv,
@@ -146,7 +197,7 @@ static inline int wpa_drv_sta_deauth(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
-                                        const u8 *addr, int reason_code)
+                                        const u8 *addr, u16 reason_code)
 {
        if (wpa_s->driver->deauthenticate) {
                return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
@@ -156,20 +207,19 @@ static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_add_pmkid(struct wpa_supplicant *wpa_s,
-                                   const u8 *bssid, const u8 *pmkid)
+                                   struct wpa_pmkid_params *params)
 {
        if (wpa_s->driver->add_pmkid) {
-               return wpa_s->driver->add_pmkid(wpa_s->drv_priv, bssid, pmkid);
+               return wpa_s->driver->add_pmkid(wpa_s->drv_priv, params);
        }
        return -1;
 }
 
 static inline int wpa_drv_remove_pmkid(struct wpa_supplicant *wpa_s,
-                                      const u8 *bssid, const u8 *pmkid)
+                                      struct wpa_pmkid_params *params)
 {
        if (wpa_s->driver->remove_pmkid) {
-               return wpa_s->driver->remove_pmkid(wpa_s->drv_priv, bssid,
-                                                  pmkid);
+               return wpa_s->driver->remove_pmkid(wpa_s->drv_priv, params);
        }
        return -1;
 }
@@ -222,16 +272,6 @@ static inline const u8 * wpa_drv_get_mac_addr(struct wpa_supplicant *wpa_s)
        return NULL;
 }
 
-static inline int wpa_drv_send_eapol(struct wpa_supplicant *wpa_s,
-                                    const u8 *dst, u16 proto,
-                                    const u8 *data, size_t data_len)
-{
-       if (wpa_s->driver->send_eapol)
-               return wpa_s->driver->send_eapol(wpa_s->drv_priv, dst, proto,
-                                                data, data_len);
-       return -1;
-}
-
 static inline int wpa_drv_set_operstate(struct wpa_supplicant *wpa_s,
                                        int state)
 {
@@ -253,11 +293,12 @@ static inline int wpa_drv_mlme_setprotection(struct wpa_supplicant *wpa_s,
 
 static inline struct hostapd_hw_modes *
 wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
-                           u16 *flags)
+                           u16 *flags, u8 *dfs_domain)
 {
        if (wpa_s->driver->get_hw_feature_data)
                return wpa_s->driver->get_hw_feature_data(wpa_s->drv_priv,
-                                                         num_modes, flags);
+                                                         num_modes, flags,
+                                                         dfs_domain);
        return NULL;
 }
 
@@ -270,11 +311,13 @@ static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
-                                   const u8 *data, size_t data_len, int noack)
+                                   const u8 *data, size_t data_len, int noack,
+                                   unsigned int freq)
 {
        if (wpa_s->driver->send_mlme)
                return wpa_s->driver->send_mlme(wpa_s->drv_priv,
-                                               data, data_len, noack);
+                                               data, data_len, noack,
+                                               freq, NULL, 0, 0);
        return -1;
 }
 
@@ -288,16 +331,6 @@ static inline int wpa_drv_update_ft_ies(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
-                                        u8 action, const u8 *target_ap,
-                                        const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->send_ft_action)
-               return wpa_s->driver->send_ft_action(wpa_s->drv_priv, action,
-                                                    target_ap, ies, ies_len);
-       return -1;
-}
-
 static inline int wpa_drv_set_ap(struct wpa_supplicant *wpa_s,
                                 struct wpa_driver_ap_params *params)
 {
@@ -322,6 +355,17 @@ static inline int wpa_drv_sta_remove(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_tx_control_port(struct wpa_supplicant *wpa_s,
+                                         const u8 *dest, u16 proto,
+                                         const u8 *buf, size_t len,
+                                         int no_encrypt)
+{
+       if (!wpa_s->driver->tx_control_port)
+               return -1;
+       return wpa_s->driver->tx_control_port(wpa_s->drv_priv, dest, proto,
+                                             buf, len, no_encrypt);
+}
+
 static inline int wpa_drv_hapd_send_eapol(struct wpa_supplicant *wpa_s,
                                          const u8 *addr, const u8 *data,
                                          size_t data_len, int encrypt,
@@ -393,7 +437,7 @@ static inline int wpa_drv_if_add(struct wpa_supplicant *wpa_s,
        if (wpa_s->driver->if_add)
                return wpa_s->driver->if_add(wpa_s->drv_priv, type, ifname,
                                             addr, bss_ctx, NULL, force_ifname,
-                                            if_addr, bridge, 0);
+                                            if_addr, bridge, 0, 0);
        return -1;
 }
 
@@ -469,11 +513,14 @@ static inline int wpa_drv_signal_monitor(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
-                                     struct wpa_signal_info *si)
+int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
+                       struct wpa_signal_info *si);
+
+static inline int wpa_drv_channel_info(struct wpa_supplicant *wpa_s,
+                                      struct wpa_channel_info *ci)
 {
-       if (wpa_s->driver->signal_poll)
-               return wpa_s->driver->signal_poll(wpa_s->drv_priv, si);
+       if (wpa_s->driver->channel_info)
+               return wpa_s->driver->channel_info(wpa_s->drv_priv, ci);
        return -1;
 }
 
@@ -497,13 +544,6 @@ static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
                                            proberesp, assocresp);
 }
 
-static inline int wpa_drv_shared_freq(struct wpa_supplicant *wpa_s)
-{
-       if (!wpa_s->driver->shared_freq)
-               return -1;
-       return wpa_s->driver->shared_freq(wpa_s->drv_priv);
-}
-
 static inline int wpa_drv_get_noa(struct wpa_supplicant *wpa_s,
                                  u8 *buf, size_t buf_len)
 {
@@ -532,14 +572,14 @@ static inline int wpa_drv_ampdu(struct wpa_supplicant *wpa_s, int ampdu)
 static inline int wpa_drv_send_tdls_mgmt(struct wpa_supplicant *wpa_s,
                                         const u8 *dst, u8 action_code,
                                         u8 dialog_token, u16 status_code,
-                                        u32 peer_capab, const u8 *buf,
-                                        size_t len)
+                                        u32 peer_capab, int initiator,
+                                        const u8 *buf, size_t len)
 {
        if (wpa_s->driver->send_tdls_mgmt) {
                return wpa_s->driver->send_tdls_mgmt(wpa_s->drv_priv, dst,
                                                     action_code, dialog_token,
                                                     status_code, peer_capab,
-                                                    buf, len);
+                                                    initiator, buf, len);
        }
        return -1;
 }
@@ -563,12 +603,14 @@ static inline int wpa_drv_driver_cmd(struct wpa_supplicant *wpa_s,
 #endif /* ANDROID */
 
 static inline void wpa_drv_set_rekey_info(struct wpa_supplicant *wpa_s,
-                                         const u8 *kek, const u8 *kck,
+                                         const u8 *kek, size_t kek_len,
+                                         const u8 *kck, size_t kck_len,
                                          const u8 *replay_ctr)
 {
        if (!wpa_s->driver->set_rekey_info)
                return;
-       wpa_s->driver->set_rekey_info(wpa_s->drv_priv, kek, kck, replay_ctr);
+       wpa_s->driver->set_rekey_info(wpa_s->drv_priv, kek, kek_len,
+                                     kck, kck_len, replay_ctr);
 }
 
 static inline int wpa_drv_radio_disable(struct wpa_supplicant *wpa_s,
@@ -587,6 +629,45 @@ static inline int wpa_drv_switch_channel(struct wpa_supplicant *wpa_s,
        return wpa_s->driver->switch_channel(wpa_s->drv_priv, settings);
 }
 
+static inline int wpa_drv_add_ts(struct wpa_supplicant *wpa_s, u8 tsid,
+                                const u8 *address, u8 user_priority,
+                                u16 admitted_time)
+{
+       if (!wpa_s->driver->add_tx_ts)
+               return -1;
+       return wpa_s->driver->add_tx_ts(wpa_s->drv_priv, tsid, address,
+                                       user_priority, admitted_time);
+}
+
+static inline int wpa_drv_del_ts(struct wpa_supplicant *wpa_s, u8 tid,
+                                const u8 *address)
+{
+       if (!wpa_s->driver->del_tx_ts)
+               return -1;
+       return wpa_s->driver->del_tx_ts(wpa_s->drv_priv, tid, address);
+}
+
+static inline int wpa_drv_tdls_enable_channel_switch(
+       struct wpa_supplicant *wpa_s, const u8 *addr, u8 oper_class,
+       const struct hostapd_freq_params *freq_params)
+{
+       if (!wpa_s->driver->tdls_enable_channel_switch)
+               return -1;
+       return wpa_s->driver->tdls_enable_channel_switch(wpa_s->drv_priv, addr,
+                                                        oper_class,
+                                                        freq_params);
+}
+
+static inline int
+wpa_drv_tdls_disable_channel_switch(struct wpa_supplicant *wpa_s,
+                                   const u8 *addr)
+{
+       if (!wpa_s->driver->tdls_disable_channel_switch)
+               return -1;
+       return wpa_s->driver->tdls_disable_channel_switch(wpa_s->drv_priv,
+                                                         addr);
+}
+
 static inline int wpa_drv_wnm_oper(struct wpa_supplicant *wpa_s,
                                   enum wnm_oper oper, const u8 *peer,
                                   u8 *buf, u16 *buf_len)
@@ -614,6 +695,13 @@ static inline int wpa_drv_set_qos_map(struct wpa_supplicant *wpa_s,
                                          qos_map_set_len);
 }
 
+static inline int wpa_drv_get_wowlan(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->get_wowlan)
+               return 0;
+       return wpa_s->driver->get_wowlan(wpa_s->drv_priv);
+}
+
 static inline int wpa_drv_wowlan(struct wpa_supplicant *wpa_s,
                                 const struct wowlan_triggers *triggers)
 {
@@ -632,6 +720,30 @@ static inline int wpa_drv_vendor_cmd(struct wpa_supplicant *wpa_s,
                                         data, data_len, buf);
 }
 
+static inline int wpa_drv_roaming(struct wpa_supplicant *wpa_s, int allowed,
+                                 const u8 *bssid)
+{
+       if (!wpa_s->driver->roaming)
+               return -1;
+       return wpa_s->driver->roaming(wpa_s->drv_priv, allowed, bssid);
+}
+
+static inline int wpa_drv_disable_fils(struct wpa_supplicant *wpa_s,
+                                      int disable)
+{
+       if (!wpa_s->driver->disable_fils)
+               return -1;
+       return wpa_s->driver->disable_fils(wpa_s->drv_priv, disable);
+}
+
+static inline int wpa_drv_set_mac_addr(struct wpa_supplicant *wpa_s,
+                                      const u8 *addr)
+{
+       if (!wpa_s->driver->set_mac_addr)
+               return -1;
+       return wpa_s->driver->set_mac_addr(wpa_s->drv_priv, addr);
+}
+
 
 #ifdef CONFIG_MACSEC
 
@@ -650,6 +762,14 @@ static inline int wpa_drv_macsec_deinit(struct wpa_supplicant *wpa_s)
        return wpa_s->driver->macsec_deinit(wpa_s->drv_priv);
 }
 
+static inline int wpa_drv_macsec_get_capability(struct wpa_supplicant *wpa_s,
+                                               enum macsec_cap *cap)
+{
+       if (!wpa_s->driver->macsec_get_capability)
+               return -1;
+       return wpa_s->driver->macsec_get_capability(wpa_s->drv_priv, cap);
+}
+
 static inline int wpa_drv_enable_protect_frames(struct wpa_supplicant *wpa_s,
                                                Boolean enabled)
 {
@@ -658,6 +778,14 @@ static inline int wpa_drv_enable_protect_frames(struct wpa_supplicant *wpa_s,
        return wpa_s->driver->enable_protect_frames(wpa_s->drv_priv, enabled);
 }
 
+static inline int wpa_drv_enable_encrypt(struct wpa_supplicant *wpa_s,
+                                               Boolean enabled)
+{
+       if (!wpa_s->driver->enable_encrypt)
+               return -1;
+       return wpa_s->driver->enable_encrypt(wpa_s->drv_priv, enabled);
+}
+
 static inline int wpa_drv_set_replay_protect(struct wpa_supplicant *wpa_s,
                                             Boolean enabled, u32 window)
 {
@@ -668,12 +796,11 @@ static inline int wpa_drv_set_replay_protect(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_set_current_cipher_suite(struct wpa_supplicant *wpa_s,
-                                                  const u8 *cs, size_t cs_len)
+                                                  u64 cs)
 {
        if (!wpa_s->driver->set_current_cipher_suite)
                return -1;
-       return wpa_s->driver->set_current_cipher_suite(wpa_s->drv_priv, cs,
-                                                      cs_len);
+       return wpa_s->driver->set_current_cipher_suite(wpa_s->drv_priv, cs);
 }
 
 static inline int wpa_drv_enable_controlled_port(struct wpa_supplicant *wpa_s,
@@ -685,146 +812,293 @@ static inline int wpa_drv_enable_controlled_port(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_get_receive_lowest_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 *lowest_pn)
+                                               struct receive_sa *sa)
 {
        if (!wpa_s->driver->get_receive_lowest_pn)
                return -1;
-       return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, channel,
-                                                   an, lowest_pn);
+       return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_get_transmit_next_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 *next_pn)
+                                               struct transmit_sa *sa)
 {
        if (!wpa_s->driver->get_transmit_next_pn)
                return -1;
-       return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, channel,
-                                                   an, next_pn);
+       return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_set_transmit_next_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 next_pn)
+                                               struct transmit_sa *sa)
 {
        if (!wpa_s->driver->set_transmit_next_pn)
                return -1;
-       return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, channel,
-                                                   an, next_pn);
+       return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, sa);
 }
 
-static inline int wpa_drv_get_available_receive_sc(struct wpa_supplicant *wpa_s,
-                                                  u32 *channel)
+static inline int wpa_drv_set_receive_lowest_pn(struct wpa_supplicant *wpa_s,
+                                               struct receive_sa *sa)
 {
-       if (!wpa_s->driver->get_available_receive_sc)
+       if (!wpa_s->driver->set_receive_lowest_pn)
                return -1;
-       return wpa_s->driver->get_available_receive_sc(wpa_s->drv_priv,
-                                                      channel);
+       return wpa_s->driver->set_receive_lowest_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int
-wpa_drv_create_receive_sc(struct wpa_supplicant *wpa_s, u32 channel,
-                         const u8 *sci_addr, u16 sci_port,
+wpa_drv_create_receive_sc(struct wpa_supplicant *wpa_s, struct receive_sc *sc,
                          unsigned int conf_offset, int validation)
 {
        if (!wpa_s->driver->create_receive_sc)
                return -1;
-       return wpa_s->driver->create_receive_sc(wpa_s->drv_priv, channel,
-                                               sci_addr, sci_port, conf_offset,
-                                               validation);
+       return wpa_s->driver->create_receive_sc(wpa_s->drv_priv, sc,
+                                               conf_offset, validation);
 }
 
 static inline int wpa_drv_delete_receive_sc(struct wpa_supplicant *wpa_s,
-                                           u32 channel)
+                                           struct receive_sc *sc)
 {
        if (!wpa_s->driver->delete_receive_sc)
                return -1;
-       return wpa_s->driver->delete_receive_sc(wpa_s->drv_priv, channel);
+       return wpa_s->driver->delete_receive_sc(wpa_s->drv_priv, sc);
 }
 
 static inline int wpa_drv_create_receive_sa(struct wpa_supplicant *wpa_s,
-                                           u32 channel, u8 an,
-                                           u32 lowest_pn, const u8 *sak)
+                                           struct receive_sa *sa)
 {
        if (!wpa_s->driver->create_receive_sa)
                return -1;
-       return wpa_s->driver->create_receive_sa(wpa_s->drv_priv, channel, an,
-                                               lowest_pn, sak);
+       return wpa_s->driver->create_receive_sa(wpa_s->drv_priv, sa);
 }
 
-static inline int wpa_drv_enable_receive_sa(struct wpa_supplicant *wpa_s,
-                                           u32 channel, u8 an)
+static inline int wpa_drv_delete_receive_sa(struct wpa_supplicant *wpa_s,
+                                           struct receive_sa *sa)
 {
-       if (!wpa_s->driver->enable_receive_sa)
+       if (!wpa_s->driver->delete_receive_sa)
                return -1;
-       return wpa_s->driver->enable_receive_sa(wpa_s->drv_priv, channel, an);
+       return wpa_s->driver->delete_receive_sa(wpa_s->drv_priv, sa);
 }
 
-static inline int wpa_drv_disable_receive_sa(struct wpa_supplicant *wpa_s,
-                                            u32 channel, u8 an)
+static inline int wpa_drv_enable_receive_sa(struct wpa_supplicant *wpa_s,
+                                           struct receive_sa *sa)
 {
-       if (!wpa_s->driver->disable_receive_sa)
+       if (!wpa_s->driver->enable_receive_sa)
                return -1;
-       return wpa_s->driver->disable_receive_sa(wpa_s->drv_priv, channel, an);
+       return wpa_s->driver->enable_receive_sa(wpa_s->drv_priv, sa);
 }
 
-static inline int
-wpa_drv_get_available_transmit_sc(struct wpa_supplicant *wpa_s, u32 *channel)
+static inline int wpa_drv_disable_receive_sa(struct wpa_supplicant *wpa_s,
+                                            struct receive_sa *sa)
 {
-       if (!wpa_s->driver->get_available_transmit_sc)
+       if (!wpa_s->driver->disable_receive_sa)
                return -1;
-       return wpa_s->driver->get_available_transmit_sc(wpa_s->drv_priv,
-                                                       channel);
+       return wpa_s->driver->disable_receive_sa(wpa_s->drv_priv, sa);
 }
 
 static inline int
-wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, u32 channel,
-                          const u8 *sci_addr, u16 sci_port,
+wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, struct transmit_sc *sc,
                           unsigned int conf_offset)
 {
        if (!wpa_s->driver->create_transmit_sc)
                return -1;
-       return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, channel,
-                                                sci_addr, sci_port,
+       return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, sc,
                                                 conf_offset);
 }
 
 static inline int wpa_drv_delete_transmit_sc(struct wpa_supplicant *wpa_s,
-                                            u32 channel)
+                                            struct transmit_sc *sc)
 {
        if (!wpa_s->driver->delete_transmit_sc)
                return -1;
-       return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, channel);
+       return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, sc);
 }
 
 static inline int wpa_drv_create_transmit_sa(struct wpa_supplicant *wpa_s,
-                                            u32 channel, u8 an,
-                                            u32 next_pn,
-                                            Boolean confidentiality,
-                                            const u8 *sak)
+                                            struct transmit_sa *sa)
 {
        if (!wpa_s->driver->create_transmit_sa)
                return -1;
-       return wpa_s->driver->create_transmit_sa(wpa_s->drv_priv, channel, an,
-                                                next_pn, confidentiality, sak);
+       return wpa_s->driver->create_transmit_sa(wpa_s->drv_priv, sa);
+}
+
+static inline int wpa_drv_delete_transmit_sa(struct wpa_supplicant *wpa_s,
+                                            struct transmit_sa *sa)
+{
+       if (!wpa_s->driver->delete_transmit_sa)
+               return -1;
+       return wpa_s->driver->delete_transmit_sa(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_enable_transmit_sa(struct wpa_supplicant *wpa_s,
-                                            u32 channel, u8 an)
+                                            struct transmit_sa *sa)
 {
        if (!wpa_s->driver->enable_transmit_sa)
                return -1;
-       return wpa_s->driver->enable_transmit_sa(wpa_s->drv_priv, channel, an);
+       return wpa_s->driver->enable_transmit_sa(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_disable_transmit_sa(struct wpa_supplicant *wpa_s,
-                                             u32 channel, u8 an)
+                                             struct transmit_sa *sa)
 {
        if (!wpa_s->driver->disable_transmit_sa)
                return -1;
-       return wpa_s->driver->disable_transmit_sa(wpa_s->drv_priv, channel, an);
+       return wpa_s->driver->disable_transmit_sa(wpa_s->drv_priv, sa);
 }
 #endif /* CONFIG_MACSEC */
 
+static inline int wpa_drv_setband(struct wpa_supplicant *wpa_s,
+                                 enum set_band band)
+{
+       if (!wpa_s->driver->set_band)
+               return -1;
+       return wpa_s->driver->set_band(wpa_s->drv_priv, band);
+}
+
+static inline int wpa_drv_get_pref_freq_list(struct wpa_supplicant *wpa_s,
+                                            enum wpa_driver_if_type if_type,
+                                            unsigned int *num,
+                                            unsigned int *freq_list)
+{
+#ifdef CONFIG_TESTING_OPTIONS
+       if (wpa_s->get_pref_freq_list_override)
+               return wpas_ctrl_iface_get_pref_freq_list_override(
+                       wpa_s, if_type, num, freq_list);
+#endif /* CONFIG_TESTING_OPTIONS */
+       if (!wpa_s->driver->get_pref_freq_list)
+               return -1;
+       return wpa_s->driver->get_pref_freq_list(wpa_s->drv_priv, if_type,
+                                                num, freq_list);
+}
+
+static inline int wpa_drv_set_prob_oper_freq(struct wpa_supplicant *wpa_s,
+                                            unsigned int freq)
+{
+       if (!wpa_s->driver->set_prob_oper_freq)
+               return 0;
+       return wpa_s->driver->set_prob_oper_freq(wpa_s->drv_priv, freq);
+}
+
+static inline int wpa_drv_abort_scan(struct wpa_supplicant *wpa_s,
+                                    u64 scan_cookie)
+{
+       if (!wpa_s->driver->abort_scan)
+               return -1;
+       return wpa_s->driver->abort_scan(wpa_s->drv_priv, scan_cookie);
+}
+
+static inline int wpa_drv_configure_frame_filters(struct wpa_supplicant *wpa_s,
+                                                 u32 filters)
+{
+       if (!wpa_s->driver->configure_data_frame_filters)
+               return -1;
+       return wpa_s->driver->configure_data_frame_filters(wpa_s->drv_priv,
+                                                          filters);
+}
+
+static inline int wpa_drv_get_ext_capa(struct wpa_supplicant *wpa_s,
+                                      enum wpa_driver_if_type type)
+{
+       if (!wpa_s->driver->get_ext_capab)
+               return -1;
+       return wpa_s->driver->get_ext_capab(wpa_s->drv_priv, type,
+                                           &wpa_s->extended_capa,
+                                           &wpa_s->extended_capa_mask,
+                                           &wpa_s->extended_capa_len);
+}
+
+static inline int wpa_drv_p2p_lo_start(struct wpa_supplicant *wpa_s,
+                                      unsigned int channel,
+                                      unsigned int period,
+                                      unsigned int interval,
+                                      unsigned int count,
+                                      const u8 *device_types,
+                                      size_t dev_types_len,
+                                      const u8 *ies, size_t ies_len)
+{
+       if (!wpa_s->driver->p2p_lo_start)
+               return -1;
+       return wpa_s->driver->p2p_lo_start(wpa_s->drv_priv, channel, period,
+                                          interval, count, device_types,
+                                          dev_types_len, ies, ies_len);
+}
+
+static inline int wpa_drv_p2p_lo_stop(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->p2p_lo_stop)
+               return -1;
+       return wpa_s->driver->p2p_lo_stop(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_set_default_scan_ies(struct wpa_supplicant *wpa_s,
+                                              const u8 *ies, size_t len)
+{
+       if (!wpa_s->driver->set_default_scan_ies)
+               return -1;
+       return wpa_s->driver->set_default_scan_ies(wpa_s->drv_priv, ies, len);
+}
+
+static inline int wpa_drv_set_tdls_mode(struct wpa_supplicant *wpa_s,
+                                       int tdls_external_control)
+{
+       if (!wpa_s->driver->set_tdls_mode)
+               return -1;
+       return wpa_s->driver->set_tdls_mode(wpa_s->drv_priv,
+                                           tdls_external_control);
+}
+
+static inline struct wpa_bss_candidate_info *
+wpa_drv_get_bss_trans_status(struct wpa_supplicant *wpa_s,
+                            struct wpa_bss_trans_info *params)
+{
+       if (!wpa_s->driver->get_bss_transition_status)
+               return NULL;
+       return wpa_s->driver->get_bss_transition_status(wpa_s->drv_priv,
+                                                       params);
+}
+
+static inline int wpa_drv_ignore_assoc_disallow(struct wpa_supplicant *wpa_s,
+                                               int val)
+{
+       if (!wpa_s->driver->ignore_assoc_disallow)
+               return -1;
+       return wpa_s->driver->ignore_assoc_disallow(wpa_s->drv_priv, val);
+}
+
+static inline int wpa_drv_set_bssid_blacklist(struct wpa_supplicant *wpa_s,
+                                             unsigned int num_bssid,
+                                             const u8 *bssids)
+{
+       if (!wpa_s->driver->set_bssid_blacklist)
+               return -1;
+       return wpa_s->driver->set_bssid_blacklist(wpa_s->drv_priv, num_bssid,
+                                                 bssids);
+}
+
+static inline int wpa_drv_update_connect_params(
+       struct wpa_supplicant *wpa_s,
+       struct wpa_driver_associate_params *params,
+       enum wpa_drv_update_connect_params_mask mask)
+{
+       if (!wpa_s->driver->update_connect_params)
+               return -1;
+       return wpa_s->driver->update_connect_params(wpa_s->drv_priv, params,
+                                                   mask);
+}
+
+static inline int
+wpa_drv_send_external_auth_status(struct wpa_supplicant *wpa_s,
+                                 struct external_auth *params)
+{
+       if (!wpa_s->driver->send_external_auth_status)
+               return -1;
+       return wpa_s->driver->send_external_auth_status(wpa_s->drv_priv,
+                                                       params);
+}
+
+static inline int wpa_drv_set_4addr_mode(struct wpa_supplicant *wpa_s, int val)
+{
+       if (!wpa_s->driver->set_4addr_mode)
+               return -1;
+       return wpa_s->driver->set_4addr_mode(wpa_s->drv_priv,
+                                            wpa_s->bridge_ifname, val);
+}
+
 #endif /* DRIVER_I_H */