jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename struct wpa_driver_ops to hapd_driver_ops

Browse source 
This avoids conflicts with the wpa_supplicant structure with the same
name.
This commit is contained in:
Jouni Malinen 2009-03-26 20:35:49 +02:00 committed by Jouni Malinen
parent b6a7859d15
commit 89111f3bbc
14 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hostapd/config.c
View file

@ -33,7 +33,7 @@
#define MAX_STA_COUNT 2007 #define MAX_STA_COUNT 2007
extern struct wpa_driver_ops *hostapd_drivers[]; extern struct hapd_driver_ops *hostapd_drivers[];
#ifndef CONFIG_NO_VLAN #ifndef CONFIG_NO_VLAN
@ -200,7 +200,7 @@ static void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
} }
static struct hostapd_config * hostapd_config_defaults(void) struct hostapd_config * hostapd_config_defaults(void)
{ {
struct hostapd_config *conf; struct hostapd_config *conf;
struct hostapd_bss_config *bss; struct hostapd_bss_config *bss;

3
hostapd/config.h
View file

@ -347,7 +347,7 @@ struct hostapd_config {
int *supported_rates; int *supported_rates;
int *basic_rates; int *basic_rates;
const struct wpa_driver_ops *driver; const struct hapd_driver_ops *driver;
int passive_scan_interval; /* seconds, 0 = disabled */ int passive_scan_interval; /* seconds, 0 = disabled */
int passive_scan_listen; /* usec */ int passive_scan_listen; /* usec */
@ -392,6 +392,7 @@ struct hostapd_config {
int hostapd_mac_comp(const void *a, const void *b); int hostapd_mac_comp(const void *a, const void *b);
int hostapd_mac_comp_empty(const void *a); int hostapd_mac_comp_empty(const void *a);
struct hostapd_config * hostapd_config_defaults(void);
struct hostapd_config * hostapd_config_read(const char *fname); struct hostapd_config * hostapd_config_read(const char *fname);
void hostapd_config_free(struct hostapd_config *conf); void hostapd_config_free(struct hostapd_config *conf);
int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries, int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries,

8
hostapd/driver.h
View file

@ -13,8 +13,8 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#ifndef DRIVER_H #ifndef HOSTAPD_DRIVER_H
#define DRIVER_H #define HOSTAPD_DRIVER_H
#include "defs.h" #include "defs.h"
#include "sta_flags.h" #include "sta_flags.h"
@ -65,7 +65,7 @@ struct hostapd_neighbor_bss {
int sec_chan; /* 0 for 20 MHz channels */ int sec_chan; /* 0 for 20 MHz channels */
}; };
struct wpa_driver_ops { struct hapd_driver_ops {
const char *name; /* as appears in the config file */ const char *name; /* as appears in the config file */
void * (*init)(struct hostapd_data *hapd); void * (*init)(struct hostapd_data *hapd);
@ -243,4 +243,4 @@ void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
u16 stype, int ok); u16 stype, int ok);
void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr); void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr);
#endif /* DRIVER_H */ #endif /* HOSTAPD_DRIVER_H */

2
hostapd/driver_atheros.c
View file

@ -1316,7 +1316,7 @@ madwifi_commit(void *priv)
return madwifi_set_iface_flags(priv, 1); return madwifi_set_iface_flags(priv, 1);
} }
const struct wpa_driver_ops wpa_driver_atheros_ops = { const struct hapd_driver_ops wpa_driver_atheros_ops = {
.name = "atheros", .name = "atheros",
.init = madwifi_init, .init = madwifi_init,
.deinit = madwifi_deinit, .deinit = madwifi_deinit,

2
hostapd/driver_bsd.c
View file

@ -750,7 +750,7 @@ bsd_deinit(void *priv)
free(drv); free(drv);
} }
const struct wpa_driver_ops wpa_driver_bsd_ops = { const struct hapd_driver_ops wpa_driver_bsd_ops = {
.name = "bsd", .name = "bsd",
.init = bsd_init, .init = bsd_init,
.deinit = bsd_deinit, .deinit = bsd_deinit,

2
hostapd/driver_hostap.c
View file

@ -1227,7 +1227,7 @@ static struct hostapd_hw_modes * hostap_get_hw_feature_data(void *priv,
} }
const struct wpa_driver_ops wpa_driver_hostap_ops = { const struct hapd_driver_ops wpa_driver_hostap_ops = {
.name = "hostap", .name = "hostap",
.init = hostap_init, .init = hostap_init,
.deinit = hostap_driver_deinit, .deinit = hostap_driver_deinit,

2
hostapd/driver_madwifi.c
View file

@ -1372,7 +1372,7 @@ madwifi_commit(void *priv)
return madwifi_set_iface_flags(priv, 1); return madwifi_set_iface_flags(priv, 1);
} }
const struct wpa_driver_ops wpa_driver_madwifi_ops = { const struct hapd_driver_ops wpa_driver_madwifi_ops = {
.name = "madwifi", .name = "madwifi",
.init = madwifi_init, .init = madwifi_init,
.deinit = madwifi_deinit, .deinit = madwifi_deinit,

2
hostapd/driver_nl80211.c
View file

@ -3103,7 +3103,7 @@ static void i802_deinit(void *priv)
} }
const struct wpa_driver_ops wpa_driver_nl80211_ops = { const struct hapd_driver_ops wpa_driver_nl80211_ops = {
.name = "nl80211", .name = "nl80211",
.init = i802_init, .init = i802_init,
.init_bssid = i802_init_bssid, .init_bssid = i802_init_bssid,

2
hostapd/driver_none.c
View file

@ -54,7 +54,7 @@ static int none_driver_send_ether(void *priv, const u8 *dst, const u8 *src,
} }
const struct wpa_driver_ops wpa_driver_none_ops = { const struct hapd_driver_ops wpa_driver_none_ops = {
.name = "none", .name = "none",
.init = none_driver_init, .init = none_driver_init,
.deinit = none_driver_deinit, .deinit = none_driver_deinit,

2
hostapd/driver_prism54.c
View file

@ -1077,7 +1077,7 @@ static void prism54_driver_deinit(void *priv)
} }
const struct wpa_driver_ops wpa_driver_prism54_ops = { const struct hapd_driver_ops wpa_driver_prism54_ops = {
.name = "prism54", .name = "prism54",
.init = prism54_driver_init, .init = prism54_driver_init,
.deinit = prism54_driver_deinit, .deinit = prism54_driver_deinit,

2
hostapd/driver_test.c
View file

@ -1200,7 +1200,7 @@ static void test_driver_deinit(void *priv)
} }
const struct wpa_driver_ops wpa_driver_test_ops = { const struct hapd_driver_ops wpa_driver_test_ops = {
.name = "test", .name = "test",
.init = test_driver_init, .init = test_driver_init,
.deinit = test_driver_deinit, .deinit = test_driver_deinit,

2
hostapd/driver_wired.c
View file

@ -366,7 +366,7 @@ static void wired_driver_deinit(void *priv)
} }
const struct wpa_driver_ops wpa_driver_wired_ops = { const struct hapd_driver_ops wpa_driver_wired_ops = {
.name = "wired", .name = "wired",
.init = wired_driver_init, .init = wired_driver_init,
.deinit = wired_driver_deinit, .deinit = wired_driver_deinit,

20
hostapd/drivers.c
View file

@ -16,35 +16,35 @@
#ifdef CONFIG_DRIVER_HOSTAP #ifdef CONFIG_DRIVER_HOSTAP
extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */ extern struct hapd_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
#endif /* CONFIG_DRIVER_HOSTAP */ #endif /* CONFIG_DRIVER_HOSTAP */
#ifdef CONFIG_DRIVER_NL80211 #ifdef CONFIG_DRIVER_NL80211
extern struct wpa_driver_ops wpa_driver_nl80211_ops; /* driver_nl80211.c */ extern struct hapd_driver_ops wpa_driver_nl80211_ops; /* driver_nl80211.c */
#endif /* CONFIG_DRIVER_NL80211 */ #endif /* CONFIG_DRIVER_NL80211 */
#ifdef CONFIG_DRIVER_PRISM54 #ifdef CONFIG_DRIVER_PRISM54
extern struct wpa_driver_ops wpa_driver_prism54_ops; /* driver_prism54.c */ extern struct hapd_driver_ops wpa_driver_prism54_ops; /* driver_prism54.c */
#endif /* CONFIG_DRIVER_PRISM54 */ #endif /* CONFIG_DRIVER_PRISM54 */
#ifdef CONFIG_DRIVER_MADWIFI #ifdef CONFIG_DRIVER_MADWIFI
extern struct wpa_driver_ops wpa_driver_madwifi_ops; /* driver_madwifi.c */ extern struct hapd_driver_ops wpa_driver_madwifi_ops; /* driver_madwifi.c */
#endif /* CONFIG_DRIVER_MADWIFI */ #endif /* CONFIG_DRIVER_MADWIFI */
#ifdef CONFIG_DRIVER_ATHEROS #ifdef CONFIG_DRIVER_ATHEROS
extern struct wpa_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */ extern struct hapd_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */
#endif /* CONFIG_DRIVER_ATHEROS */ #endif /* CONFIG_DRIVER_ATHEROS */
#ifdef CONFIG_DRIVER_BSD #ifdef CONFIG_DRIVER_BSD
extern struct wpa_driver_ops wpa_driver_bsd_ops; /* driver_bsd.c */ extern struct hapd_driver_ops wpa_driver_bsd_ops; /* driver_bsd.c */
#endif /* CONFIG_DRIVER_BSD */ #endif /* CONFIG_DRIVER_BSD */
#ifdef CONFIG_DRIVER_WIRED #ifdef CONFIG_DRIVER_WIRED
extern struct wpa_driver_ops wpa_driver_wired_ops; /* driver_wired.c */ extern struct hapd_driver_ops wpa_driver_wired_ops; /* driver_wired.c */
#endif /* CONFIG_DRIVER_WIRED */ #endif /* CONFIG_DRIVER_WIRED */
#ifdef CONFIG_DRIVER_TEST #ifdef CONFIG_DRIVER_TEST
extern struct wpa_driver_ops wpa_driver_test_ops; /* driver_test.c */ extern struct hapd_driver_ops wpa_driver_test_ops; /* driver_test.c */
#endif /* CONFIG_DRIVER_TEST */ #endif /* CONFIG_DRIVER_TEST */
#ifdef CONFIG_DRIVER_NONE #ifdef CONFIG_DRIVER_NONE
extern struct wpa_driver_ops wpa_driver_none_ops; /* driver_none.c */ extern struct hapd_driver_ops wpa_driver_none_ops; /* driver_none.c */
#endif /* CONFIG_DRIVER_NONE */ #endif /* CONFIG_DRIVER_NONE */
struct wpa_driver_ops *hostapd_drivers[] = struct hapd_driver_ops *hostapd_drivers[] =
{ {
#ifdef CONFIG_DRIVER_HOSTAP #ifdef CONFIG_DRIVER_HOSTAP
&wpa_driver_hostap_ops, &wpa_driver_hostap_ops,

4
hostapd/hostapd.h
View file

@ -20,7 +20,7 @@
#include "common.h" #include "common.h"
#include "hostapd_defs.h" #include "hostapd_defs.h"
struct wpa_driver_ops; struct hapd_driver_ops;
struct wpa_ctrl_dst; struct wpa_ctrl_dst;
struct radius_server_data; struct radius_server_data;
struct upnp_wps_device_sm; struct upnp_wps_device_sm;
@ -54,7 +54,7 @@ struct hostapd_data {
#define AID_WORDS ((2008 + 31) / 32) #define AID_WORDS ((2008 + 31) / 32)
u32 sta_aid[AID_WORDS]; u32 sta_aid[AID_WORDS];
const struct wpa_driver_ops *driver; const struct hapd_driver_ops *driver;
void *drv_priv; void *drv_priv;
u8 *default_wep_key; u8 *default_wep_key;