aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/events.c
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2015-07-27 19:24:22 (GMT)
committerJouni Malinen <j@w1.fi>2015-08-03 21:32:36 (GMT)
commita7160f7ede509bf1bd4b346899711e25320f13db (patch)
treefc37fb23c19587c40c0331d2d2b4b14171b9fc66 /wpa_supplicant/events.c
parente280110d1782a12bf08e97034d418d2559375c7d (diff)
downloadhostap-a7160f7ede509bf1bd4b346899711e25320f13db.zip
hostap-a7160f7ede509bf1bd4b346899711e25320f13db.tar.gz
hostap-a7160f7ede509bf1bd4b346899711e25320f13db.tar.bz2
P2P: Remove GO handling in avoid frequency event
Remove the code that considers removing GOs from their current channel due to frequency interference, as this is already handled as part of the P2P channels update. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Diffstat (limited to 'wpa_supplicant/events.c')
-rw-r--r--wpa_supplicant/events.c30
1 files changed, 5 insertions, 25 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index ee2ff81..558e977 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -3143,9 +3143,6 @@ static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
static void wpa_supplicant_notify_avoid_freq(struct wpa_supplicant *wpa_s,
union wpa_event_data *event)
{
-#ifdef CONFIG_P2P
- struct wpa_supplicant *ifs;
-#endif /* CONFIG_P2P */
struct wpa_freq_range_list *list;
char *str = NULL;
@@ -3162,29 +3159,12 @@ static void wpa_supplicant_notify_avoid_freq(struct wpa_supplicant *wpa_s,
__func__);
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Update channel list based on frequency avoid event");
- wpas_p2p_update_channel_list(wpa_s);
- }
-
- for (ifs = wpa_s->global->ifaces; ifs; ifs = ifs->next) {
- int freq;
- if (!ifs->current_ssid ||
- !ifs->current_ssid->p2p_group ||
- (ifs->current_ssid->mode != WPAS_MODE_P2P_GO &&
- ifs->current_ssid->mode != WPAS_MODE_P2P_GROUP_FORMATION))
- continue;
- freq = ifs->current_ssid->frequency;
- if (!freq_range_list_includes(list, freq)) {
- wpa_dbg(ifs, MSG_DEBUG, "P2P GO operating frequency %d MHz in safe range",
- freq);
- continue;
- }
-
- wpa_dbg(ifs, MSG_DEBUG, "P2P GO operating in unsafe frequency %d MHz",
- freq);
- /* TODO: Consider using CSA or removing the group within
- * wpa_supplicant */
- wpa_msg(ifs, MSG_INFO, P2P_EVENT_REMOVE_AND_REFORM_GROUP);
+ /*
+ * The update channel flow will also take care of moving a GO
+ * from the unsafe frequency if needed.
+ */
+ wpas_p2p_update_channel_list(wpa_s);
}
#endif /* CONFIG_P2P */