Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...
[libeap.git] / wpa_supplicant / wpa_supplicant_i.h
index eddd41e..66f544e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * wpa_supplicant - Internal definitions
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-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
@@ -15,7 +15,8 @@
 #ifndef WPA_SUPPLICANT_I_H
 #define WPA_SUPPLICANT_I_H
 
-#include "drivers/driver.h"
+#include "utils/list.h"
+#include "common/defs.h"
 
 extern const char *wpa_supplicant_version;
 extern const char *wpa_supplicant_license;
@@ -27,13 +28,12 @@ extern const char *wpa_supplicant_full_license4;
 extern const char *wpa_supplicant_full_license5;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
-extern struct wpa_driver_ops *wpa_supplicant_drivers[];
-
-
-struct wpa_scan_result;
 struct wpa_sm;
 struct wpa_supplicant;
 struct ibss_rsn;
+struct scan_info;
+struct wpa_bss;
+struct wpa_scan_results;
 
 /*
  * Forward declarations of private structures used within the ctrl_iface
@@ -42,7 +42,7 @@ struct ibss_rsn;
  */
 struct ctrl_iface_priv;
 struct ctrl_iface_global_priv;
-struct ctrl_iface_dbus_priv;
+struct wpas_dbus_priv;
 
 /**
  * struct wpa_interface - Parameters for wpa_supplicant_add_iface()
@@ -162,6 +162,36 @@ struct wpa_params {
         * wpa_debug_syslog - Enable log output through syslog
         */
        int wpa_debug_syslog;
+
+       /**
+        * override_driver - Optional driver parameter override
+        *
+        * This parameter can be used to override the driver parameter in
+        * dynamic interface addition to force a specific driver wrapper to be
+        * used instead.
+        */
+       char *override_driver;
+
+       /**
+        * override_ctrl_interface - Optional ctrl_interface override
+        *
+        * This parameter can be used to override the ctrl_interface parameter
+        * in dynamic interface addition to force a control interface to be
+        * created.
+        */
+       char *override_ctrl_interface;
+};
+
+struct p2p_srv_bonjour {
+       struct dl_list list;
+       struct wpabuf *query;
+       struct wpabuf *resp;
+};
+
+struct p2p_srv_upnp {
+       struct dl_list list;
+       u8 version;
+       char *service;
 };
 
 /**
@@ -174,9 +204,17 @@ struct wpa_global {
        struct wpa_supplicant *ifaces;
        struct wpa_params params;
        struct ctrl_iface_global_priv *ctrl_iface;
-       struct ctrl_iface_dbus_priv *dbus_ctrl_iface;
+       struct wpas_dbus_priv *dbus;
        void **drv_priv;
        size_t drv_count;
+       struct os_time suspend_time;
+       struct p2p_data *p2p;
+       struct wpa_supplicant *p2p_group_formation;
+       u8 p2p_dev_addr[ETH_ALEN];
+       struct dl_list p2p_srv_bonjour; /* struct p2p_srv_bonjour */
+       struct dl_list p2p_srv_upnp; /* struct p2p_srv_upnp */
+       int p2p_disabled;
+       int cross_connection;
 };
 
 
@@ -196,7 +234,7 @@ struct wpa_client_mlme {
        size_t extra_ie_len;
        u8 *extra_probe_ie; /* to be added to the end of ProbeReq */
        size_t extra_probe_ie_len;
-       wpa_key_mgmt key_mgmt;
+       enum wpa_key_mgmt key_mgmt;
 
        /* The last AssocReq/Resp IEs */
        u8 *assocreq_ies, *assocresp_ies;
@@ -217,10 +255,8 @@ struct wpa_client_mlme {
 
        struct os_time last_probe;
 
-#define IEEE80211_AUTH_ALG_OPEN BIT(0)
-#define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1)
-#define IEEE80211_AUTH_ALG_LEAP BIT(2)
-       unsigned int auth_algs; /* bitfield of allowed auth algs */
+       unsigned int auth_algs; /* bitfield of allowed auth algs
+                                * (WPA_AUTH_ALG_*) */
        int auth_alg; /* currently used IEEE 802.11 authentication algorithm */
        int auth_transaction;
 
@@ -242,6 +278,7 @@ struct wpa_client_mlme {
        u8 scan_ssid[32];
        size_t scan_ssid_len;
        int scan_skip_11b;
+       int *scan_freqs;
 
        struct ieee80211_sta_bss *sta_bss_list;
 #define STA_HASH_SIZE 256
@@ -250,13 +287,13 @@ struct wpa_client_mlme {
 
        int cts_protect_erp_frames;
 
-       int phymode; /* current mode; WPA_MODE_IEEE80211A, .. */
-       struct wpa_hw_modes *modes;
+       enum hostapd_hw_mode phymode; /* current mode */
+       struct hostapd_hw_modes *modes;
        size_t num_modes;
        unsigned int hw_modes; /* bitfield of allowed hardware modes;
-                               * (1 << MODE_*) */
+                               * (1 << HOSTAPD_MODE_*) */
        int num_curr_rates;
-       struct wpa_rate_data *curr_rates;
+       int *curr_rates;
        int freq; /* The current frequency in MHz */
        int channel; /* The current IEEE 802.11 channel number */
 
@@ -266,6 +303,10 @@ struct wpa_client_mlme {
        size_t ft_ies_len;
 #endif /* CONFIG_IEEE80211R */
 
+       void (*public_action_cb)(void *ctx, const u8 *buf, size_t len,
+                                int freq);
+       void *public_action_cb_ctx;
+
 #else /* CONFIG_CLIENT_MLME */
        int dummy; /* to keep MSVC happy */
 #endif /* CONFIG_CLIENT_MLME */
@@ -281,6 +322,7 @@ struct wpa_client_mlme {
  */
 struct wpa_supplicant {
        struct wpa_global *global;
+       struct wpa_supplicant *parent;
        struct wpa_supplicant *next;
        struct l2_packet_data *l2;
        struct l2_packet_data *l2_br;
@@ -289,6 +331,9 @@ struct wpa_supplicant {
 #ifdef CONFIG_CTRL_IFACE_DBUS
        char *dbus_path;
 #endif /* CONFIG_CTRL_IFACE_DBUS */
+#ifdef CONFIG_CTRL_IFACE_DBUS_NEW
+       char *dbus_new_path;
+#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
        char bridge_ifname[16];
 
        char *confname;
@@ -302,7 +347,9 @@ struct wpa_supplicant {
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
        struct wpa_ssid *current_ssid;
+       struct wpa_bss *current_bss;
        int ap_ies_from_associnfo;
+       unsigned int assoc_freq;
 
        /* Selected configuration (based on Beacon/ProbeResp WPA IE) */
        int pairwise_cipher;
@@ -311,7 +358,7 @@ struct wpa_supplicant {
        int mgmt_group_cipher;
 
        void *drv_priv; /* private data used by driver_ops */
-       int drv_wired;
+       void *global_drv_priv;
 
        struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID;
                                          * NULL = not yet initialized (start
@@ -321,7 +368,13 @@ struct wpa_supplicant {
                                          */
 #define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1)
 
-       struct wpa_scan_results *scan_res;
+       void (*scan_res_handler)(struct wpa_supplicant *wpa_s,
+                                struct wpa_scan_results *scan_res);
+       struct dl_list bss; /* struct wpa_bss::list */
+       struct dl_list bss_id; /* struct wpa_bss::list_id */
+       size_t num_bss;
+       unsigned int bss_update_idx;
+       unsigned int bss_next_id;
 
        struct wpa_driver_ops *driver;
        int interface_removed; /* whether the network interface has been
@@ -331,7 +384,8 @@ struct wpa_supplicant {
 
        struct ctrl_iface_priv *ctrl_iface;
 
-       wpa_states wpa_state;
+       enum wpa_states wpa_state;
+       int scanning;
        int new_connection;
        int reassociated_connection;
 
@@ -348,16 +402,13 @@ struct wpa_supplicant {
 
        int scan_req; /* manual scan request; this forces a scan even if there
                       * are no enabled networks in the configuration */
-       int scan_res_tried; /* whether ap_scan=1 mode has tried to fetch scan
-                            * results without a new scan request; this is used
-                            * to speed up the first association if the driver
-                            * has already available scan results. */
        int scan_runs; /* number of scan runs since WPS was started */
 
        struct wpa_client_mlme mlme;
-       int use_client_mlme;
-       int driver_4way_handshake;
+       unsigned int drv_flags;
        int max_scan_ssids;
+       unsigned int max_remain_on_chan;
+       unsigned int max_stations;
 
        int pending_mic_error_report;
        int pending_mic_error_pairwise;
@@ -365,32 +416,140 @@ struct wpa_supplicant {
 
        struct wps_context *wps;
        int wps_success; /* WPS success event received */
+       struct wps_er *wps_er;
        int blacklist_cleared;
 
+       struct wpabuf *pending_eapol_rx;
+       struct os_time pending_eapol_rx_time;
+       u8 pending_eapol_rx_src[ETH_ALEN];
+
        struct ibss_rsn *ibss_rsn;
+
+       int set_sta_uapsd;
+       int sta_uapsd;
+       int set_ap_uapsd;
+       int ap_uapsd;
+
+#ifdef CONFIG_SME
+       struct {
+               u8 ssid[32];
+               size_t ssid_len;
+               int freq;
+               u8 assoc_req_ie[200];
+               size_t assoc_req_ie_len;
+               int mfp;
+               int ft_used;
+               u8 mobility_domain[2];
+               u8 *ft_ies;
+               size_t ft_ies_len;
+               u8 prev_bssid[ETH_ALEN];
+               int prev_bssid_set;
+               int auth_alg;
+       } sme;
+#endif /* CONFIG_SME */
+
+#ifdef CONFIG_AP
+       struct hostapd_iface *ap_iface;
+       void (*ap_configured_cb)(void *ctx, void *data);
+       void *ap_configured_cb_ctx;
+       void *ap_configured_cb_data;
+#endif /* CONFIG_AP */
+
+#ifdef CONFIG_P2P
+       struct p2p_go_neg_results *go_params;
+       int create_p2p_iface;
+       u8 pending_interface_addr[ETH_ALEN];
+       char pending_interface_name[IFNAMSIZ];
+       int pending_interface_type;
+       int p2p_group_idx;
+       unsigned int off_channel_freq;
+       struct wpabuf *pending_action_tx;
+       u8 pending_action_src[ETH_ALEN];
+       u8 pending_action_dst[ETH_ALEN];
+       u8 pending_action_bssid[ETH_ALEN];
+       unsigned int pending_action_freq;
+       int pending_action_without_roc;
+       unsigned int pending_listen_freq;
+       unsigned int pending_listen_duration;
+       enum {
+               NOT_P2P_GROUP_INTERFACE,
+               P2P_GROUP_INTERFACE_PENDING,
+               P2P_GROUP_INTERFACE_GO,
+               P2P_GROUP_INTERFACE_CLIENT
+       } p2p_group_interface;
+       struct p2p_group *p2p_group;
+       int p2p_long_listen;
+       char p2p_pin[10];
+       int p2p_wps_method;
+       u8 p2p_auth_invite[ETH_ALEN];
+       int p2p_sd_over_ctrl_iface;
+       int p2p_in_provisioning;
+       int pending_invite_ssid_id;
+       int show_group_started;
+       u8 go_dev_addr[ETH_ALEN];
+       int pending_pd_before_join;
+       u8 pending_join_iface_addr[ETH_ALEN];
+       u8 pending_join_dev_addr[ETH_ALEN];
+       int pending_join_wps_method;
+       unsigned int roc_waiting_drv_freq;
+       int force_long_sd;
+
+       /*
+        * Whether cross connection is disallowed by the AP to which this
+        * interface is associated (only valid if there is an association).
+        */
+       int cross_connect_disallowed;
+
+       /*
+        * Whether this P2P group is configured to use cross connection (only
+        * valid if this is P2P GO interface). The actual cross connect packet
+        * forwarding may not be configured depending on the uplink status.
+        */
+       int cross_connect_enabled;
+
+       /* Whether cross connection forwarding is in use at the moment. */
+       int cross_connect_in_use;
+
+       /*
+        * Uplink interface name for cross connection
+        */
+       char cross_connect_uplink[100];
+#endif /* CONFIG_P2P */
+
+       struct wpa_ssid *bgscan_ssid;
+       const struct bgscan_ops *bgscan;
+       void *bgscan_priv;
+
+       int connect_without_scan;
+
+       int after_wps;
+       unsigned int wps_freq;
+       int wps_fragment_size;
+       int auto_reconnect_disabled;
 };
 
 
 /* wpa_supplicant.c */
+int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
+
 int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s);
 
-const char * wpa_supplicant_state_txt(int state);
+const char * wpa_supplicant_state_txt(enum wpa_states state);
 int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s);
 int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
-                             struct wpa_scan_res *bss,
-                             struct wpa_ssid *ssid,
+                             struct wpa_bss *bss, struct wpa_ssid *ssid,
                              u8 *wpa_ie, size_t *wpa_ie_len);
 void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
-                             struct wpa_scan_res *bss,
+                             struct wpa_bss *bss,
                              struct wpa_ssid *ssid);
 void wpa_supplicant_set_non_wpa_policy(struct wpa_supplicant *wpa_s,
                                       struct wpa_ssid *ssid);
 void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s);
-int wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s);
 void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr);
 void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
                                     int sec, int usec);
-void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_states state);
+void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
+                             enum wpa_states state);
 struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
@@ -398,6 +557,18 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
 void wpa_supplicant_disassociate(struct wpa_supplicant *wpa_s,
                                 int reason_code);
 
+void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s,
+                                  struct wpa_ssid *ssid);
+void wpa_supplicant_disable_network(struct wpa_supplicant *wpa_s,
+                                   struct wpa_ssid *ssid);
+void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
+                                  struct wpa_ssid *ssid);
+int wpa_supplicant_set_ap_scan(struct wpa_supplicant *wpa_s,
+                              int ap_scan);
+int wpa_supplicant_set_debug_params(struct wpa_global *global,
+                                   int debug_level, int debug_timestamp,
+                                   int debug_show_keys);
+
 void wpa_show_license(void);
 
 struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
@@ -412,365 +583,21 @@ void wpa_supplicant_deinit(struct wpa_global *global);
 
 int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s,
                              struct wpa_ssid *ssid);
-
-/* scan.c */
-void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
-void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
+void wpa_supplicant_terminate_proc(struct wpa_global *global);
+void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
+                            const u8 *buf, size_t len);
+enum wpa_key_mgmt key_mgmt2driver(int key_mgmt);
+enum wpa_cipher cipher_suite2driver(int cipher);
+void wpa_supplicant_update_config(struct wpa_supplicant *wpa_s);
+void wpa_supplicant_clear_status(struct wpa_supplicant *wpa_s);
 
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);
+void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
+                           struct wpa_bss *selected,
+                           struct wpa_ssid *ssid);
 
-/* driver_ops */
-static inline void * wpa_drv_init(struct wpa_supplicant *wpa_s,
-                                 const char *ifname)
-{
-       if (wpa_s->driver->init2)
-               return wpa_s->driver->init2(wpa_s, ifname, wpa_s->global);
-       if (wpa_s->driver->init) {
-               return wpa_s->driver->init(wpa_s, ifname);
-       }
-       return NULL;
-}
-
-static inline void wpa_drv_deinit(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->deinit)
-               wpa_s->driver->deinit(wpa_s->drv_priv);
-}
-
-static inline int wpa_drv_set_param(struct wpa_supplicant *wpa_s,
-                                   const char *param)
-{
-       if (wpa_s->driver->set_param)
-               return wpa_s->driver->set_param(wpa_s->drv_priv, param);
-       return 0;
-}
-
-static inline int wpa_drv_set_drop_unencrypted(struct wpa_supplicant *wpa_s,
-                                              int enabled)
-{
-       if (wpa_s->driver->set_drop_unencrypted) {
-               return wpa_s->driver->set_drop_unencrypted(wpa_s->drv_priv,
-                                                          enabled);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_countermeasures(struct wpa_supplicant *wpa_s,
-                                             int enabled)
-{
-       if (wpa_s->driver->set_countermeasures) {
-               return wpa_s->driver->set_countermeasures(wpa_s->drv_priv,
-                                                         enabled);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_auth_alg(struct wpa_supplicant *wpa_s,
-                                      int auth_alg)
-{
-       if (wpa_s->driver->set_auth_alg) {
-               return wpa_s->driver->set_auth_alg(wpa_s->drv_priv,
-                                                  auth_alg);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_wpa(struct wpa_supplicant *wpa_s, int enabled)
-{
-       if (wpa_s->driver->set_wpa) {
-               return wpa_s->driver->set_wpa(wpa_s->drv_priv, enabled);
-       }
-       return 0;
-}
-
-static inline int wpa_drv_set_mode(struct wpa_supplicant *wpa_s, int mode)
-{
-       if (wpa_s->driver->set_mode) {
-               return wpa_s->driver->set_mode(wpa_s->drv_priv, mode);
-       }
-       return 0;
-}
-
-static inline int wpa_drv_associate(struct wpa_supplicant *wpa_s,
-                                   struct wpa_driver_associate_params *params)
-{
-       if (wpa_s->driver->associate) {
-               return wpa_s->driver->associate(wpa_s->drv_priv, params);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
-                              struct wpa_driver_scan_params *params)
-{
-       if (wpa_s->driver->scan2)
-               return wpa_s->driver->scan2(wpa_s->drv_priv, params);
-       if (wpa_s->driver->scan)
-               return wpa_s->driver->scan(wpa_s->drv_priv,
-                                          params->ssids[0].ssid,
-                                          params->ssids[0].ssid_len);
-       return -1;
-}
-
-static inline int wpa_drv_get_scan_results(struct wpa_supplicant *wpa_s,
-                                          struct wpa_scan_result *results,
-                                          size_t max_size)
-{
-       if (wpa_s->driver->get_scan_results) {
-               return wpa_s->driver->get_scan_results(wpa_s->drv_priv,
-                                                      results, max_size);
-       }
-       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;
-}
-
-static inline int wpa_drv_get_bssid(struct wpa_supplicant *wpa_s, u8 *bssid)
-{
-       if (wpa_s->driver->get_bssid) {
-               return wpa_s->driver->get_bssid(wpa_s->drv_priv, bssid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid)
-{
-       if (wpa_s->driver->get_ssid) {
-               return wpa_s->driver->get_ssid(wpa_s->drv_priv, ssid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s, 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 (wpa_s->driver->set_key) {
-               wpa_s->keys_cleared = 0;
-               return wpa_s->driver->set_key(wpa_s->drv_priv, alg, addr,
-                                             key_idx, set_tx, seq, seq_len,
-                                             key, key_len);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
-                                        const u8 *addr, int reason_code)
-{
-       if (wpa_s->driver->deauthenticate) {
-               return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
-                                                    reason_code);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_disassociate(struct wpa_supplicant *wpa_s,
-                                      const u8 *addr, int reason_code)
-{
-       if (wpa_s->driver->disassociate) {
-               return wpa_s->driver->disassociate(wpa_s->drv_priv, addr,
-                                                  reason_code);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_add_pmkid(struct wpa_supplicant *wpa_s,
-                                   const u8 *bssid, const u8 *pmkid)
-{
-       if (wpa_s->driver->add_pmkid) {
-               return wpa_s->driver->add_pmkid(wpa_s->drv_priv, bssid, pmkid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_remove_pmkid(struct wpa_supplicant *wpa_s,
-                                      const u8 *bssid, const u8 *pmkid)
-{
-       if (wpa_s->driver->remove_pmkid) {
-               return wpa_s->driver->remove_pmkid(wpa_s->drv_priv, bssid,
-                                                  pmkid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_flush_pmkid(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->flush_pmkid) {
-               return wpa_s->driver->flush_pmkid(wpa_s->drv_priv);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_get_capa(struct wpa_supplicant *wpa_s,
-                                  struct wpa_driver_capa *capa)
-{
-       if (wpa_s->driver->get_capa) {
-               return wpa_s->driver->get_capa(wpa_s->drv_priv, capa);
-       }
-       return -1;
-}
-
-static inline void wpa_drv_poll(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->poll) {
-               wpa_s->driver->poll(wpa_s->drv_priv);
-       }
-}
-
-static inline const char * wpa_drv_get_ifname(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_ifname) {
-               return wpa_s->driver->get_ifname(wpa_s->drv_priv);
-       }
-       return NULL;
-}
-
-static inline const u8 * wpa_drv_get_mac_addr(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_mac_addr) {
-               return wpa_s->driver->get_mac_addr(wpa_s->drv_priv);
-       }
-       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)
-{
-       if (wpa_s->driver->set_operstate)
-               return wpa_s->driver->set_operstate(wpa_s->drv_priv, state);
-       return 0;
-}
-
-static inline int wpa_drv_mlme_setprotection(struct wpa_supplicant *wpa_s,
-                                            const u8 *addr, int protect_type,
-                                            int key_type)
-{
-       if (wpa_s->driver->mlme_setprotection)
-               return wpa_s->driver->mlme_setprotection(wpa_s->drv_priv, addr,
-                                                        protect_type,
-                                                        key_type);
-       return 0;
-}
-
-static inline struct wpa_hw_modes *
-wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
-                           u16 *flags)
-{
-       if (wpa_s->driver->get_hw_feature_data)
-               return wpa_s->driver->get_hw_feature_data(wpa_s->drv_priv,
-                                                         num_modes, flags);
-       return NULL;
-}
-
-static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
-                                     wpa_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)
-{
-       if (wpa_s->driver->set_country)
-               return wpa_s->driver->set_country(wpa_s->drv_priv, alpha2);
-       return 0;
-}
-
-static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
-                                   const u8 *data, size_t data_len)
-{
-       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);
-       return -1;
-}
-
-static inline int wpa_drv_update_ft_ies(struct wpa_supplicant *wpa_s,
-                                       const u8 *md,
-                                       const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->update_ft_ies)
-               return wpa_s->driver->update_ft_ies(wpa_s->drv_priv, md,
-                                                   ies, ies_len);
-       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_probe_req_ie(struct wpa_supplicant *wpa_s,
-                                          const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->set_probe_req_ie)
-               return wpa_s->driver->set_probe_req_ie(wpa_s->drv_priv, ies,
-                                                      ies_len);
-       return -1;
-}
+/* eap_register.c */
+int eap_register_methods(void);
 
 #endif /* WPA_SUPPLICANT_I_H */