From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 13 May 2014 19:27:44 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3231d65ffe36e177caf5006d4079867d9b7b2d4a;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

3231d65ffe36e177caf5006d4079867d9b7b2d4a
diff --cc net/wireless/scan.c
index 0f5da18cc619,88f108edfb58..e7329bb6a323
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@@ -284,14 -284,22 +284,22 @@@ void cfg80211_sched_scan_results(struc
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_results);
  
- void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy)
  {
 -	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
 +	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
  
+ 	ASSERT_RTNL();
+ 
  	trace_cfg80211_sched_scan_stopped(wiphy);
  
- 	rtnl_lock();
  	__cfg80211_stop_sched_scan(rdev, true);
+ }
+ EXPORT_SYMBOL(cfg80211_sched_scan_stopped_rtnl);
+ 
+ void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ {
+ 	rtnl_lock();
+ 	cfg80211_sched_scan_stopped_rtnl(wiphy);
  	rtnl_unlock();
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_stopped);