From: Eliad Peller <eliad@wizery.com>
Date: Tue, 3 Dec 2013 13:02:15 +0000 (+0200)
Subject: mac80211: remove duplicate code
X-Git-Tag: v3.14-rc1~94^2~334^2^2~86
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=de61b610def5249a1295b1eac92f3ce2bfa76b9d;p=linux.git

mac80211: remove duplicate code

The same code appears just a few lines below.

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

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index c22cbb57b49d..b12bb72a5f37 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -785,14 +785,6 @@ void ieee80211_scan_work(struct work_struct *work)
 			goto out;
 	}
 
-	/*
-	 * Avoid re-scheduling when the sdata is going away.
-	 */
-	if (!ieee80211_sdata_running(sdata)) {
-		aborted = true;
-		goto out_complete;
-	}
-
 	/*
 	 * as long as no delay is required advance immediately
 	 * without scheduling a new work