From: Jouni Malinen Date: Sun, 1 Mar 2015 20:15:44 +0000 (+0200) Subject: Remove unnecessary NULL check to make function more consistent X-Git-Tag: hostap_2_4~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9feadba141a8244055c67ed3b508611a02ea8953;p=thirdparty%2Fhostap.git Remove unnecessary NULL check to make function more consistent Static analyzers may warn about dereference before NULL check in wpas_network_disabled() due to the new code added to check wpa_s->p2p_mgmt. wpa_s cannot be NULL here, so remove the unneeded check for it later in the function. (CID 106124) Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 5848202b1..19fb8900b 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -4986,7 +4986,7 @@ int wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) if (ssid->disabled) return 1; - if (wpa_s && wpa_s->drv_capa_known) + if (wpa_s->drv_capa_known) drv_enc = wpa_s->drv_enc; else drv_enc = (unsigned int) -1;