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

nl80211: Move AP SME setup to mode change

Browse source 
Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-12-03 19:47:01 +02:00 committed by Jouni Malinen
parent 32ab485503
commit 3fd1cefb81
1 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/drivers/driver_nl80211.c
View file

@ -226,6 +226,7 @@ struct wpa_driver_nl80211_data {
int monitor_sock;
int monitor_ifidx;
int monitor_refcount;
unsigned int disabled_11b_rates:1;
unsigned int pending_remain_on_chan:1;
@ -5157,6 +5158,10 @@ static int add_monitor_filter(int s)
static void nl80211_remove_monitor_interface(
struct wpa_driver_nl80211_data *drv)
{
drv->monitor_refcount--;
if (drv->monitor_refcount > 0)
return;
if (drv->monitor_ifidx >= 0) {
nl80211_remove_iface(drv, drv->monitor_ifidx);
drv->monitor_ifidx = -1;
@ -5177,6 +5182,11 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
int optval;
socklen_t optlen;
if (drv->monitor_ifidx >= 0) {
drv->monitor_refcount++;
return 0;
}
if (os_strncmp(drv->first_bss.ifname, "p2p-", 4) == 0) {
/*
* P2P interface name is of the format p2p-%s-%d. For monitor
@ -5255,6 +5265,38 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
}
static int nl80211_setup_ap(struct i802_bss *bss)
{
struct wpa_driver_nl80211_data *drv = bss->drv;
if (!drv->device_ap_sme &&
nl80211_create_monitor_interface(drv) &&
!drv->device_ap_sme)
return -1;
if (drv->device_ap_sme &&
wpa_driver_nl80211_probe_req_report(bss, 1) < 0) {
wpa_printf(MSG_DEBUG, "nl80211: Failed to enable "
"Probe Request frame reporting in AP mode");
/* Try to survive without this */
}
return 0;
}
static void nl80211_teardown_ap(struct i802_bss *bss)
{
struct wpa_driver_nl80211_data *drv = bss->drv;
if (drv->device_ap_sme)
wpa_driver_nl80211_probe_req_report(bss, 0);
else
nl80211_remove_monitor_interface(drv);
bss->beacon_set = 0;
}
static int nl80211_send_eapol_data(struct i802_bss *bss,
const u8 *addr, const u8 *data,
size_t data_len)
@ -5428,15 +5470,6 @@ static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv,
return -1;
}
if (drv->device_ap_sme) {
if (wpa_driver_nl80211_probe_req_report(&drv->first_bss, 1) < 0)
{
wpa_printf(MSG_DEBUG, "nl80211: Failed to enable "
"Probe Request frame reporting in AP mode");
/* Try to survive without this */
}
}
drv->ap_oper_freq = params->freq;
return 0;
@ -5988,18 +6021,19 @@ static int wpa_driver_nl80211_set_mode(struct i802_bss *bss,
}
done:
if (!ret && is_ap_interface(nlmode)) {
if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Interface mode change to %d "
"from %d failed", nlmode, drv->nlmode);
return ret;
}
if (is_ap_interface(nlmode)) {
/* Setup additional AP mode functionality if needed */
if (!drv->device_ap_sme && drv->monitor_ifidx < 0 &&
nl80211_create_monitor_interface(drv) &&
!drv->device_ap_sme)
if (nl80211_setup_ap(bss))
return -1;
} else if (!ret && !is_ap_interface(nlmode)) {
} else if (was_ap) {
/* Remove additional AP mode functionality */
if (was_ap && drv->device_ap_sme)
wpa_driver_nl80211_probe_req_report(bss, 0);
nl80211_remove_monitor_interface(drv);
bss->beacon_set = 0;
nl80211_teardown_ap(bss);
}
if (!ret && is_p2p_interface(drv->nlmode)) {
@ -6010,11 +6044,7 @@ done:
drv->disabled_11b_rates = 0;
}
if (ret)
wpa_printf(MSG_DEBUG, "nl80211: Interface mode change to %d "
"from %d failed", nlmode, drv->nlmode);
return ret;
return 0;
}