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

nl80211: Fix mgmt RX for device SME in AP mode without monitor

Browse source 
Drivers that use device SME in AP mode may still need to be
subscribed for Action frame RX when monitor interface is not used.
This fixes number of P2P GO operations with ath6kl.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2011-12-23 18:15:07 +02:00 committed by Jouni Malinen
parent 536062f274
commit a6cc0602dd
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/drivers/driver_nl80211.c
View file

@ -3163,6 +3163,28 @@ out_err:
} }
static int nl80211_mgmt_subscribe_ap_dev_sme(struct i802_bss *bss)
{
if (nl80211_alloc_mgmt_handle(bss))
return -1;
wpa_printf(MSG_DEBUG, "nl80211: Subscribe to mgmt frames with AP "
"handle %p (device SME)", bss->nl_mgmt);
if (nl80211_register_frame(bss, bss->nl_mgmt,
(WLAN_FC_TYPE_MGMT << 2) |
(WLAN_FC_STYPE_ACTION << 4),
NULL, 0) < 0)
goto out_err;
return 0;
out_err:
eloop_unregister_read_sock(nl_socket_get_fd(bss->nl_mgmt));
nl_destroy_handles(&bss->nl_mgmt);
return -1;
}
static void nl80211_mgmt_unsubscribe(struct i802_bss *bss, const char *reason) static void nl80211_mgmt_unsubscribe(struct i802_bss *bss, const char *reason)
{ {
if (bss->nl_mgmt == NULL) if (bss->nl_mgmt == NULL)
@ -6084,6 +6106,10 @@ static int nl80211_setup_ap(struct i802_bss *bss)
if (nl80211_mgmt_subscribe_ap(bss)) if (nl80211_mgmt_subscribe_ap(bss))
return -1; return -1;
if (drv->device_ap_sme && !drv->use_monitor)
if (nl80211_mgmt_subscribe_ap_dev_sme(bss))
return -1;
if (!drv->device_ap_sme && drv->use_monitor && if (!drv->device_ap_sme && drv->use_monitor &&
nl80211_create_monitor_interface(drv) && nl80211_create_monitor_interface(drv) &&
!drv->device_ap_sme) !drv->device_ap_sme)
@ -6104,9 +6130,11 @@ static void nl80211_teardown_ap(struct i802_bss *bss)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
if (drv->device_ap_sme) if (drv->device_ap_sme) {
wpa_driver_nl80211_probe_req_report(bss, 0); wpa_driver_nl80211_probe_req_report(bss, 0);
else if (drv->use_monitor) if (!drv->use_monitor)
nl80211_mgmt_unsubscribe(bss, "AP teardown (dev SME)");
} else if (drv->use_monitor)
nl80211_remove_monitor_interface(drv); nl80211_remove_monitor_interface(drv);
else else
nl80211_mgmt_unsubscribe(bss, "AP teardown"); nl80211_mgmt_unsubscribe(bss, "AP teardown");