DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Fix monitor interface reference counting

Browse source 
The first user of monitor interface was not counted and that could
result in the monitor interface getting removed if the initial interface
was removed from a multi-BSS setup.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-10-31 21:55:17 +02:00 committed by Jouni Malinen
parent 08e55ebbb0
commit 748c0ac0e7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/drivers/driver_nl80211.c
View file

@ -7378,7 +7378,10 @@ static int add_monitor_filter(int s)
static void nl80211_remove_monitor_interface( static void nl80211_remove_monitor_interface(
struct wpa_driver_nl80211_data *drv) struct wpa_driver_nl80211_data *drv)
{ {
if (drv->monitor_refcount > 0)
drv->monitor_refcount--; drv->monitor_refcount--;
wpa_printf(MSG_DEBUG, "nl80211: Remove monitor interface: refcount=%d",
drv->monitor_refcount);
if (drv->monitor_refcount > 0) if (drv->monitor_refcount > 0)
return; return;
@ -7404,6 +7407,8 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
if (drv->monitor_ifidx >= 0) { if (drv->monitor_ifidx >= 0) {
drv->monitor_refcount++; drv->monitor_refcount++;
wpa_printf(MSG_DEBUG, "nl80211: Re-use existing monitor interface: refcount=%d",
drv->monitor_refcount);
return 0; return 0;
} }
@ -7481,6 +7486,7 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
goto error; goto error;
} }
drv->monitor_refcount++;
return 0; return 0;
error: error:
nl80211_remove_monitor_interface(drv); nl80211_remove_monitor_interface(drv);
@ -7492,8 +7498,8 @@ static int nl80211_setup_ap(struct i802_bss *bss)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
wpa_printf(MSG_DEBUG, "nl80211: Setup AP - device_ap_sme=%d " wpa_printf(MSG_DEBUG, "nl80211: Setup AP(%s) - device_ap_sme=%d use_monitor=%d",
"use_monitor=%d", drv->device_ap_sme, drv->use_monitor); bss->ifname, drv->device_ap_sme, drv->use_monitor);
/* /*
* Disable Probe Request reporting unless we need it in this way for * Disable Probe Request reporting unless we need it in this way for
@ -7531,6 +7537,8 @@ 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;
wpa_printf(MSG_DEBUG, "nl80211: Teardown AP(%s) - device_ap_sme=%d use_monitor=%d",
bss->ifname, drv->device_ap_sme, drv->use_monitor);
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);
if (!drv->use_monitor) if (!drv->use_monitor)