From: Eliad Peller Date: Wed, 30 Apr 2014 13:14:24 +0000 (+0300) Subject: mac80211: fix nested rtnl locking on ieee80211_reconfig X-Git-Tag: v3.15-rc7~8^2~47^2^2^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e669ba2d06c6195662601956454ac959892f0762;p=~emulex%2Finfiniband.git mac80211: fix nested rtnl locking on ieee80211_reconfig ieee80211_reconfig already holds rtnl, so calling cfg80211_sched_scan_stopped results in deadlock. Use the rtnl-version of this function instead. Fixes: d43c6b6 ("mac80211: reschedule sched scan after HW restart") Cc: stable@vger.kernel.org (3.14+) Signed-off-by: Eliad Peller Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 275c94f995f..3c365837e91 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.