From: Eliad Peller <eliad@wizery.com>
Date: Wed, 12 Nov 2014 08:08:29 +0000 (+0200)
Subject: mac80211: remove redundant check
X-Git-Tag: v3.19-rc1~118^2~134^2~2^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff5db4392c75e005882dd93641b2caa436437dd6;p=karo-tx-linux.git

mac80211: remove redundant check

local->scan_req was tested in the previous line, so it
can't be NULL.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index af0d094b2f2f..d23c8d90c3b4 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -799,7 +799,7 @@ void ieee80211_scan_work(struct work_struct *work)
 	if (!sdata || !local->scan_req)
 		goto out;
 
-	if (local->scan_req && !local->scanning) {
+	if (!local->scanning) {
 		struct cfg80211_scan_request *req = local->scan_req;
 		int rc;