diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-04-09 20:01:25 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2009-04-09 20:01:25 +0300 |
| commit | e785c2ba3b580972770eae96ac5bb7dc80f70512 (patch) | |
| tree | d974db2b7024f67bdec02a5837b69e49a64e8905 /src/drivers/driver_nl80211.c | |
| parent | 9f324b61babe2fb2a80544a8739eee065e73cd7b (diff) | |
| download | external_wpa_supplicant_8_ti-e785c2ba3b580972770eae96ac5bb7dc80f70512.zip external_wpa_supplicant_8_ti-e785c2ba3b580972770eae96ac5bb7dc80f70512.tar.gz external_wpa_supplicant_8_ti-e785c2ba3b580972770eae96ac5bb7dc80f70512.tar.bz2 | |
Share same set_country driver op for hostapd and wpa_supplicant
Diffstat (limited to 'src/drivers/driver_nl80211.c')
| -rw-r--r-- | src/drivers/driver_nl80211.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 2372d7a..5bbf469 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -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 */ }; |