From: Jouni Malinen Date: Tue, 19 Nov 2013 10:29:25 +0000 (+0200) Subject: P2P: Optimize default case for own freq preference setting X-Git-Tag: hostap_2_1~518 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5624ccfe93aac092029c840f36c76c40f92aac5b;p=thirdparty%2Fhostap.git P2P: Optimize default case for own freq preference setting There is no need to use wpas_p2p_num_unused_channels() here in the default configuration of p2p_ignore_sahred_freq=0, so re-order the conditions to skip that operation. This is a bit more efficient and the debug log is also a bit cleaner in the default case. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 20eee0ab4..407f3e4d4 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -177,9 +177,9 @@ static void wpas_p2p_set_own_freq_preference(struct wpa_supplicant *wpa_s, { if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) return; - if (freq > 0 && wpa_s->num_multichan_concurrent > 1 && - wpas_p2p_num_unused_channels(wpa_s) > 0 && - wpa_s->parent->conf->p2p_ignore_shared_freq) { + if (wpa_s->parent->conf->p2p_ignore_shared_freq && + freq > 0 && wpa_s->num_multichan_concurrent > 1 && + wpas_p2p_num_unused_channels(wpa_s) > 0) { wpa_printf(MSG_DEBUG, "P2P: Ignore own channel preference %d MHz due to p2p_ignore_shared_freq=1 configuration", freq); freq = 0;