OSDN Git Service

am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0
[android-x86/external-wpa_supplicant_8.git] / wpa_supplicant / driver_i.h
index b0c5ef0..bc148ca 100644 (file)
@@ -2,14 +2,8 @@
  * wpa_supplicant - Internal driver interface wrappers
  * Copyright (c) 2003-2009, 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.
  */
 
 #ifndef DRIVER_I_H
@@ -79,6 +73,23 @@ static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_sched_scan(struct wpa_supplicant *wpa_s,
+                                    struct wpa_driver_scan_params *params,
+                                    u32 interval)
+{
+       if (wpa_s->driver->sched_scan)
+               return wpa_s->driver->sched_scan(wpa_s->drv_priv,
+                                                params, interval);
+       return -1;
+}
+
+static inline int wpa_drv_stop_sched_scan(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->stop_sched_scan)
+               return wpa_s->driver->stop_sched_scan(wpa_s->drv_priv);
+       return -1;
+}
+
 static inline struct wpa_scan_results * wpa_drv_get_scan_results2(
        struct wpa_supplicant *wpa_s)
 {
@@ -236,35 +247,6 @@ wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
        return NULL;
 }
 
-static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
-                                     enum hostapd_hw_mode phymode, int chan,
-                                     int freq)
-{
-       if (wpa_s->driver->set_channel)
-               return wpa_s->driver->set_channel(wpa_s->drv_priv, phymode,
-                                                 chan, freq);
-       return -1;
-}
-
-static inline int wpa_drv_set_ssid(struct wpa_supplicant *wpa_s,
-                                  const u8 *ssid, size_t ssid_len)
-{
-       if (wpa_s->driver->set_ssid) {
-               return wpa_s->driver->set_ssid(wpa_s->drv_priv, ssid,
-                                              ssid_len);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_bssid(struct wpa_supplicant *wpa_s,
-                                   const u8 *bssid)
-{
-       if (wpa_s->driver->set_bssid) {
-               return wpa_s->driver->set_bssid(wpa_s->drv_priv, bssid);
-       }
-       return -1;
-}
-
 static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
                                      const char *alpha2)
 {
@@ -274,29 +256,11 @@ 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)
+                                   const u8 *data, size_t data_len, int noack)
 {
        if (wpa_s->driver->send_mlme)
                return wpa_s->driver->send_mlme(wpa_s->drv_priv,
-                                               data, data_len);
-       return -1;
-}
-
-static inline int wpa_drv_mlme_add_sta(struct wpa_supplicant *wpa_s,
-                                      const u8 *addr, const u8 *supp_rates,
-                                      size_t supp_rates_len)
-{
-       if (wpa_s->driver->mlme_add_sta)
-               return wpa_s->driver->mlme_add_sta(wpa_s->drv_priv, addr,
-                                                  supp_rates, supp_rates_len);
-       return -1;
-}
-
-static inline int wpa_drv_mlme_remove_sta(struct wpa_supplicant *wpa_s,
-                                         const u8 *addr)
-{
-       if (wpa_s->driver->mlme_remove_sta)
-               return wpa_s->driver->mlme_remove_sta(wpa_s->drv_priv, addr);
+                                               data, data_len, noack);
        return -1;
 }
 
@@ -320,15 +284,11 @@ static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_beacon(struct wpa_supplicant *wpa_s,
-                                    const u8 *head, size_t head_len,
-                                    const u8 *tail, size_t tail_len,
-                                    int dtim_period, int beacon_int)
+static inline int wpa_drv_set_ap(struct wpa_supplicant *wpa_s,
+                                struct wpa_driver_ap_params *params)
 {
-       if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->drv_priv, head,
-                                                head_len, tail, tail_len,
-                                                dtim_period, beacon_int);
+       if (wpa_s->driver->set_ap)
+               return wpa_s->driver->set_ap(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -386,12 +346,13 @@ static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
                                      unsigned int wait,
                                      const u8 *dst, const u8 *src,
                                      const u8 *bssid,
-                                     const u8 *data, size_t data_len)
+                                     const u8 *data, size_t data_len,
+                                     int no_cck)
 {
        if (wpa_s->driver->send_action)
                return wpa_s->driver->send_action(wpa_s->drv_priv, freq,
                                                  wait, dst, src, bssid,
-                                                 data, data_len);
+                                                 data, data_len, no_cck);
        return -1;
 }
 
@@ -431,14 +392,6 @@ static inline int wpa_drv_if_remove(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_intra_bss(struct wpa_supplicant *wpa_s,
-                                       int enabled)
-{
-       if (wpa_s->driver->set_intra_bss)
-               return wpa_s->driver->set_intra_bss(wpa_s->drv_priv, enabled);
-       return -1;
-}
-
 static inline int wpa_drv_remain_on_channel(struct wpa_supplicant *wpa_s,
                                            unsigned int freq,
                                            unsigned int duration)
@@ -467,15 +420,6 @@ static inline int wpa_drv_probe_req_report(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_disable_11b_rates(struct wpa_supplicant *wpa_s,
-                                           int disabled)
-{
-       if (wpa_s->driver->disable_11b_rates)
-               return wpa_s->driver->disable_11b_rates(wpa_s->drv_priv,
-                                                       disabled);
-       return -1;
-}
-
 static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
 {
        if (wpa_s->driver->deinit_ap)
@@ -483,6 +427,13 @@ static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
        return 0;
 }
 
+static inline int wpa_drv_deinit_p2p_cli(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->deinit_p2p_cli)
+               return wpa_s->driver->deinit_p2p_cli(wpa_s->drv_priv);
+       return 0;
+}
+
 static inline void wpa_drv_suspend(struct wpa_supplicant *wpa_s)
 {
        if (wpa_s->driver->suspend)
@@ -512,6 +463,15 @@ static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_pktcnt_poll(struct wpa_supplicant *wpa_s,
+                                     struct hostap_sta_driver_data *sta)
+{
+       if (wpa_s->driver->read_sta_data)
+               return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta,
+                                                   wpa_s->bssid);
+       return -1;
+}
+
 static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
                                        const struct wpabuf *beacon,
                                        const struct wpabuf *proberesp,
@@ -619,12 +579,12 @@ static inline int wpa_drv_p2p_set_params(struct wpa_supplicant *wpa_s,
 
 static inline int wpa_drv_p2p_prov_disc_req(struct wpa_supplicant *wpa_s,
                                            const u8 *peer_addr,
-                                           u16 config_methods)
+                                           u16 config_methods, int join)
 {
        if (!wpa_s->driver->p2p_prov_disc_req)
                return -1;
        return wpa_s->driver->p2p_prov_disc_req(wpa_s->drv_priv, peer_addr,
-                                               config_methods);
+                                               config_methods, join);
 }
 
 static inline u64 wpa_drv_p2p_sd_request(struct wpa_supplicant *wpa_s,
@@ -704,6 +664,7 @@ static inline int wpa_drv_tdls_oper(struct wpa_supplicant *wpa_s,
        return wpa_s->driver->tdls_oper(wpa_s->drv_priv, oper, peer);
 }
 
+#ifdef ANDROID
 static inline int wpa_drv_driver_cmd(struct wpa_supplicant *wpa_s,
                                     char *cmd, char *buf, size_t buf_len)
 {
@@ -711,5 +672,41 @@ static inline int wpa_drv_driver_cmd(struct wpa_supplicant *wpa_s,
                return -1;
        return wpa_s->driver->driver_cmd(wpa_s->drv_priv, cmd, buf, buf_len);
 }
+#endif
+
+static inline void wpa_drv_set_rekey_info(struct wpa_supplicant *wpa_s,
+                                         const u8 *kek, const u8 *kck,
+                                         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);
+}
+
+static inline int wpa_drv_radio_disable(struct wpa_supplicant *wpa_s,
+                                       int disabled)
+{
+       if (!wpa_s->driver->radio_disable)
+               return -1;
+       return wpa_s->driver->radio_disable(wpa_s->drv_priv, disabled);
+}
+
+static inline int wpa_drv_switch_channel(struct wpa_supplicant *wpa_s,
+                                        unsigned int freq)
+{
+       if (!wpa_s->driver->switch_channel)
+               return -1;
+       return wpa_s->driver->switch_channel(wpa_s->drv_priv, freq);
+}
+
+static inline int wpa_drv_wnm_oper(struct wpa_supplicant *wpa_s,
+                                  enum wnm_oper oper, const u8 *peer,
+                                  u8 *buf, u16 *buf_len)
+{
+       if (!wpa_s->driver->wnm_oper)
+               return -1;
+       return wpa_s->driver->wnm_oper(wpa_s->drv_priv, oper, peer, buf,
+                                      buf_len);
+}
 
 #endif /* DRIVER_I_H */