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

nl80211: Move preq NL handle into BSS

Browse source 
Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-11-19 19:48:49 +02:00 committed by Jouni Malinen
parent ddc5327139
commit 221a59c9b6
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/drivers/driver_nl80211.c
View file

@ -167,6 +167,8 @@ struct i802_bss {
unsigned int beacon_set:1; unsigned int beacon_set:1;
unsigned int added_if_into_bridge:1; unsigned int added_if_into_bridge:1;
unsigned int added_bridge:1; unsigned int added_bridge:1;
struct nl80211_handles nl_preq;
}; };
struct wpa_driver_nl80211_data { struct wpa_driver_nl80211_data {
@ -187,7 +189,7 @@ struct wpa_driver_nl80211_data {
int scan_complete_events; int scan_complete_events;
struct nl80211_handles nl_event, nl_preq; struct nl80211_handles nl_event;
u8 auth_bssid[ETH_ALEN]; u8 auth_bssid[ETH_ALEN];
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
@ -2542,7 +2544,7 @@ static void wpa_driver_nl80211_deinit(void *priv)
close(drv->eapol_tx_sock); close(drv->eapol_tx_sock);
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
if (drv->nl_preq.handle) if (bss->nl_preq.handle)
wpa_driver_nl80211_probe_req_report(bss, 0); wpa_driver_nl80211_probe_req_report(bss, 0);
if (bss->added_if_into_bridge) { if (bss->added_if_into_bridge) {
if (linux_br_del_if(drv->global->ioctl_sock, bss->brname, if (linux_br_del_if(drv->global->ioctl_sock, bss->brname,
@ -7057,37 +7059,37 @@ static int wpa_driver_nl80211_probe_req_report(void *priv, int report)
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
if (!report) { if (!report) {
if (drv->nl_preq.handle) { if (bss->nl_preq.handle) {
eloop_unregister_read_sock( eloop_unregister_read_sock(
nl_socket_get_fd(drv->nl_preq.handle)); nl_socket_get_fd(bss->nl_preq.handle));
nl_destroy_handles(&drv->nl_preq); nl_destroy_handles(&bss->nl_preq);
} }
return 0; return 0;
} }
if (drv->nl_preq.handle) { if (bss->nl_preq.handle) {
wpa_printf(MSG_DEBUG, "nl80211: Probe Request reporting " wpa_printf(MSG_DEBUG, "nl80211: Probe Request reporting "
"already on!"); "already on!");
return 0; return 0;
} }
if (nl_create_handles(&drv->nl_preq, drv->global->nl_cb, "preq")) if (nl_create_handles(&bss->nl_preq, drv->global->nl_cb, "preq"))
return -1; return -1;
if (nl80211_register_frame(drv, drv->nl_preq.handle, if (nl80211_register_frame(drv, bss->nl_preq.handle,
(WLAN_FC_TYPE_MGMT << 2) | (WLAN_FC_TYPE_MGMT << 2) |
(WLAN_FC_STYPE_PROBE_REQ << 4), (WLAN_FC_STYPE_PROBE_REQ << 4),
NULL, 0) < 0) NULL, 0) < 0)
goto out_err; goto out_err;
eloop_register_read_sock(nl_socket_get_fd(drv->nl_preq.handle), eloop_register_read_sock(nl_socket_get_fd(bss->nl_preq.handle),
wpa_driver_nl80211_event_receive, drv, wpa_driver_nl80211_event_receive, drv,
drv->nl_preq.handle); bss->nl_preq.handle);
return 0; return 0;
out_err: out_err:
nl_destroy_handles(&drv->nl_preq); nl_destroy_handles(&bss->nl_preq);
return -1; return -1;
} }