diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-05-09 16:46:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-09 16:46:53 -0400 |
| commit | 1448eb566970c6d3cade522419848fdaee24c684 (patch) | |
| tree | b11b67b20f823125597c2a8f726b677f3cab4b26 /net/mac80211/util.c | |
| parent | net: cassini: use nested lock annotation (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (diff) | |
| download | linux-dev-1448eb566970c6d3cade522419848fdaee24c684.tar.xz linux-dev-1448eb566970c6d3cade522419848fdaee24c684.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-05-08
This one is all from Johannes:
"Here are a few small fixes for the current cycle: radiotap TX flags were
wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
Eliad fixes a locking bug and a cfg80211 state problem and finally
Henning sent me a fix for IBSS rate information."
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 275c94f995f7..3c365837e910 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1780,7 +1780,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) mutex_unlock(&local->mtx); if (sched_scan_stopped) - cfg80211_sched_scan_stopped(local->hw.wiphy); + cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy); /* * If this is for hw restart things are still running. |