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

P2P: Allow separate P2P group interface use to be disabled

Browse source 
The new p2p_no_group_iface=1 configuration parameter can now be used to
disable the default behavior of adding a separate interface for the P2P
group when driver support for concurrent interfaces is available.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-10-29 15:02:30 +02:00 committed by Jouni Malinen
parent 5fbddfdcf1
commit d76cd41a3a
4 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/config.c
View file

@ -3008,6 +3008,7 @@ static const struct global_parse_data global_fields[] = {
{ FUNC(p2p_pref_chan), CFG_CHANGED_P2P_PREF_CHAN }, { FUNC(p2p_pref_chan), CFG_CHANGED_P2P_PREF_CHAN },
{ INT(p2p_go_ht40), 0 }, { INT(p2p_go_ht40), 0 },
{ INT(p2p_disabled), 0 }, { INT(p2p_disabled), 0 },
{ INT(p2p_no_group_iface), 0 },
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
{ FUNC(country), CFG_CHANGED_COUNTRY }, { FUNC(country), CFG_CHANGED_COUNTRY },
{ INT(bss_max_count), 0 }, { INT(bss_max_count), 0 },

11
wpa_supplicant/config.h
View file

@ -762,6 +762,17 @@ struct wpa_config {
* p2p_disabled - Whether P2P operations are disabled for this interface * p2p_disabled - Whether P2P operations are disabled for this interface
*/ */
int p2p_disabled; int p2p_disabled;
/**
* p2p_no_group_iface - Whether group interfaces can be used
*
* By default, wpa_supplicant will create a separate interface for P2P
* group operations if the driver supports this. This functionality can
* be disabled by setting this parameter to 1. In that case, the same
* interface that was used for the P2P management operations is used
* also for the group operation.
*/
int p2p_no_group_iface;
}; };

3
wpa_supplicant/config_file.c
View file

@ -872,6 +872,9 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
fprintf(f, "p2p_go_ht40=%u\n", config->p2p_go_ht40); fprintf(f, "p2p_go_ht40=%u\n", config->p2p_go_ht40);
if (config->p2p_disabled) if (config->p2p_disabled)
fprintf(f, "p2p_disabled=%u\n", config->p2p_disabled); fprintf(f, "p2p_disabled=%u\n", config->p2p_disabled);
if (config->p2p_no_group_iface)
fprintf(f, "p2p_no_group_iface=%u\n",
config->p2p_no_group_iface);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
if (config->country[0] && config->country[1]) { if (config->country[0] && config->country[1]) {
fprintf(f, "country=%c%c\n", fprintf(f, "country=%c%c\n",

2
wpa_supplicant/p2p_supplicant.c
View file

@ -2859,6 +2859,8 @@ void wpas_p2p_deinit_global(struct wpa_global *global)
static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s) static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s)
{ {
if (wpa_s->conf->p2p_no_group_iface)
return 0; /* separate interface disabled per configuration */
if (wpa_s->drv_flags & if (wpa_s->drv_flags &
(WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE | (WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE |
WPA_DRIVER_FLAGS_P2P_MGMT_AND_NON_P2P)) WPA_DRIVER_FLAGS_P2P_MGMT_AND_NON_P2P))