summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-11-12 10:08:29 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-11-19 18:45:48 +0100
commitff5db4392c75e005882dd93641b2caa436437dd6 (patch)
treecfbc9d266f50f95c5a4480a3cfdc2146a6728edf
parent8cd4d4563ef0a518002c4a8f47dd950afe386ea8 (diff)
downloadlinux-ff5db4392c75e005882dd93641b2caa436437dd6.tar.bz2
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>
-rw-r--r--net/mac80211/scan.c2
1 files changed, 1 insertions, 1 deletions
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;