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

nl80211: Fix P2P Device handling when starting with RF-kill blocked

Browse source 
On RF-kill, we should not request the kernel to start a P2P device. In
addition, we should call i802_set_iface_flags() both for a P2P Device
interface and any other interface instead of calling a dedicated
function for each.

Signed-off-by: Moshe Benji <Moshe.Benji@intel.com>
This commit is contained in:
Moshe Benji 2014-03-03 14:53:21 +02:00 committed by Jouni Malinen
parent 5e3ddf4d23
commit 8c06db703d
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/drivers/driver_nl80211.c
View file

@ -4642,26 +4642,25 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
return -1; return -1;
} }
if (nlmode == NL80211_IFTYPE_P2P_DEVICE) { if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
int ret = nl80211_set_p2pdev(bss, 1);
if (ret < 0)
wpa_printf(MSG_ERROR, "nl80211: Could not start P2P device");
nl80211_get_macaddr(bss); nl80211_get_macaddr(bss);
return ret;
}
if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1)) { if (!rfkill_is_blocked(drv->rfkill)) {
if (rfkill_is_blocked(drv->rfkill)) { int ret = i802_set_iface_flags(bss, 1);
wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable " if (ret) {
"interface '%s' due to rfkill",
bss->ifname);
drv->if_disabled = 1;
send_rfkill_event = 1;
} else {
wpa_printf(MSG_ERROR, "nl80211: Could not set " wpa_printf(MSG_ERROR, "nl80211: Could not set "
"interface '%s' UP", bss->ifname); "interface '%s' UP", bss->ifname);
return -1; return ret;
} }
if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
return ret;
} else {
wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable "
"interface '%s' due to rfkill", bss->ifname);
if (nlmode == NL80211_IFTYPE_P2P_DEVICE)
return 0;
drv->if_disabled = 1;
send_rfkill_event = 1;
} }
if (!drv->hostapd) if (!drv->hostapd)