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

nl80211: Do not re-set iftype when initializing added interface

Browse source 
There is no need to force the interface into station mode when
wpa_supplicant adds a new interface (e.g., P2P group) with the correct
iftype.
This commit is contained in:
Jouni Malinen 2011-07-17 20:03:25 +03:00
parent a1922f934d
commit ff6a158b40
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/drivers/driver_nl80211.c
View file

@ -105,6 +105,7 @@ static void nl80211_handle_destroy(struct nl_handle *handle)
struct nl80211_global {
struct dl_list interfaces;
int if_add_ifindex;
};
struct i802_bss {
@ -2132,7 +2133,14 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
drv->first_bss.ifindex = drv->ifindex;
#ifndef HOSTAPD
if (wpa_driver_nl80211_set_mode(bss, IEEE80211_MODE_INFRA) < 0) {
/*
* Make sure the interface starts up in station mode unless this is a
* dynamically added interface (e.g., P2P) that was already configured
* with proper iftype.
*/
if ((drv->global == NULL ||
drv->ifindex != drv->global->if_add_ifindex) &&
wpa_driver_nl80211_set_mode(bss, IEEE80211_MODE_INFRA) < 0) {
wpa_printf(MSG_DEBUG, "nl80211: Could not configure driver to "
"use managed mode");
}
@ -6072,6 +6080,9 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
}
#endif /* HOSTAPD */
if (drv->global)
drv->global->if_add_ifindex = ifidx;
return 0;
}
@ -6651,6 +6662,7 @@ static void * nl80211_global_init(void)
if (global == NULL)
return NULL;
dl_list_init(&global->interfaces);
global->if_add_ifindex = -1;
return global;
}