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

Share same set_country driver op for hostapd and wpa_supplicant

Browse source
This commit is contained in:
Jouni Malinen 2009-04-09 20:01:25 +03:00 committed by Jouni Malinen
parent 9f324b61ba
commit e785c2ba3b
6 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hostapd/driver_i.h
View file

@ -291,9 +291,9 @@ static inline int
hostapd_set_country(struct hostapd_data *hapd, const char *country)
{
if (hapd->driver == NULL ||
hapd->driver->hapd_set_country == NULL)
hapd->driver->set_country == NULL)
return 0;
return hapd->driver->hapd_set_country(hapd->drv_priv, country);
return hapd->driver->set_country(hapd->drv_priv, country);
}
static inline int

1
src/drivers/driver.h
View file

@ -1263,7 +1263,6 @@ struct wpa_driver_ops {
int total_flags, int flags_or, int flags_and);
int (*set_rate_sets)(void *priv, int *supp_rates, int *basic_rates,
int mode);
int (*hapd_set_country)(void *priv, const char *country);
int (*set_ieee80211d)(void *priv, int enabled);
int (*hapd_set_beacon)(const char *ifname, void *priv,
const u8 *head, size_t head_len,

1
src/drivers/driver_ndis.c
View file

@ -3242,7 +3242,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
NULL /* set_retry */,
NULL /* sta_set_flags */,
NULL /* set_rate_sets */,
NULL /* hapd_set_country */,
NULL /* set_ieee80211d */,
NULL /* hapd_set_beacon */,
NULL /* set_internal_bridge */,

27
src/drivers/driver_nl80211.c
View file

@ -921,7 +921,7 @@ static int wpa_driver_nl80211_set_country(void *priv, const char *alpha2_arg)
msg = nlmsg_alloc();
if (!msg)
goto nla_put_failure;
return -ENOMEM;
alpha2[0] = alpha2_arg[0];
alpha2[1] = alpha2_arg[1];
@ -3815,30 +3815,6 @@ static int i802_set_sta_vlan(void *priv, const u8 *addr,
}
static int i802_set_country(void *priv, const char *country)
{
struct wpa_driver_nl80211_data *drv = priv;
struct nl_msg *msg;
char alpha2[3];
msg = nlmsg_alloc();
if (!msg)
return -ENOMEM;
genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
0, NL80211_CMD_REQ_SET_REG, 0);
alpha2[0] = country[0];
alpha2[1] = country[1];
alpha2[2] = '\0';
NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2, alpha2);
return send_and_recv_msgs(drv, msg, NULL, NULL);
nla_put_failure:
return -ENOBUFS;
}
static void handle_tx_callback(struct hostapd_data *hapd, u8 *buf, size_t len,
int ok)
{
@ -5064,7 +5040,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
.if_update = i802_if_update,
.if_remove = i802_if_remove,
.set_sta_vlan = i802_set_sta_vlan,
.hapd_set_country = i802_set_country,
.get_neighbor_bss = i802_get_neighbor_bss,
#endif /* HOSTAPD */
};

1
src/drivers/driver_privsep.c
View file

@ -838,7 +838,6 @@ struct wpa_driver_ops wpa_driver_privsep_ops = {
NULL /* set_retry */,
NULL /* sta_set_flags */,
NULL /* set_rate_sets */,
NULL /* hapd_set_country */,
NULL /* set_ieee80211d */,
NULL /* hapd_set_beacon */,
NULL /* set_internal_bridge */,

1
src/drivers/driver_test.c
View file

@ -2546,7 +2546,6 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
NULL /* set_retry */,
NULL /* sta_set_flags */,
NULL /* set_rate_sets */,
NULL /* hapd_set_country */,
NULL /* set_ieee80211d */,
NULL /* hapd_set_beacon */,
NULL /* set_internal_bridge */,