aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wpa_supplicant_i.h
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2015-06-17 13:18:20 (GMT)
committerJouni Malinen <j@w1.fi>2015-06-19 13:22:26 (GMT)
commitf43c1ae7989c38fe15756f12a9196a1cf798b4d7 (patch)
treeae57b5df37afdbb5bee2f77ca6186d80d005e873 /wpa_supplicant/wpa_supplicant_i.h
parent1ac977bdd51f20c2ee50cebfb79344d3a012db88 (diff)
downloadhostap-f43c1ae7989c38fe15756f12a9196a1cf798b4d7.zip
hostap-f43c1ae7989c38fe15756f12a9196a1cf798b4d7.tar.gz
hostap-f43c1ae7989c38fe15756f12a9196a1cf798b4d7.tar.bz2
P2P: Handle P2P Device dedicated interface parent removal
In case of a network interface removal, check if the interface was also the parent interface of the P2P Device dedicated interface. If this is the case, then stop the P2P Device functionality, and remove the P2P Device dedicated interface. In case that the interface is added again and P2P Device functionality can be enabled again, add a new P2P Device dedicated interface and allow further P2P Device functionality. In case that the P2P Device dedicated interface is re-created, the original P2P Device configuration file is needed, so store it in the global params (instead in the wpa_interface configuration). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Diffstat (limited to 'wpa_supplicant/wpa_supplicant_i.h')
-rw-r--r--wpa_supplicant/wpa_supplicant_i.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 8ace44f..dd5b245 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -66,17 +66,6 @@ struct wpa_interface {
*/
const char *confanother;
-#ifdef CONFIG_P2P
- /**
- * conf_p2p_dev - Configuration file used to hold the
- * P2P Device configuration parameters.
- *
- * This can also be %NULL. In such a case, if a P2P Device dedicated
- * interfaces is created, the main configuration file will be used.
- */
- const char *conf_p2p_dev;
-#endif /* CONFIG_P2P */
-
/**
* ctrl_interface - Control interface parameter
*
@@ -227,6 +216,18 @@ struct wpa_params {
* its internal entropy store over restarts.
*/
char *entropy_file;
+
+#ifdef CONFIG_P2P
+ /**
+ * conf_p2p_dev - Configuration file used to hold the
+ * P2P Device configuration parameters.
+ *
+ * This can also be %NULL. In such a case, if a P2P Device dedicated
+ * interfaces is created, the main configuration file will be used.
+ */
+ const char *conf_p2p_dev;
+#endif /* CONFIG_P2P */
+
};
struct p2p_srv_bonjour {