projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8cd4d45)
mac80211: remove redundant check
authorEliad Peller <eliad@wizery.com>
Wed, 12 Nov 2014 08:08:29 +0000 (10:08 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 19 Nov 2014 17:45:48 +0000 (18:45 +0100)
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>
net/mac80211/scan.c patch | blob | blame | history

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index af0d094b2f2f0ecc6939edd15b2c2d253763e10b..d23c8d90c3b428430f9edd71851e66ebeba6ac68 100644 (file)
--- 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;