git.ipfire.org Git - thirdparty/kernel/stable.git/commit

author	Eliad Peller <eliad@wizery.com>
	Wed, 30 Apr 2014 13:14:24 +0000 (16:14 +0300)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 7 Jun 2014 17:28:10 +0000 (10:28 -0700)
commit	8faa53c451ac66d604253105b2041356d723d4c1
tree	da4e748776c28904920f59a571791bb0656b6a49	tree
parent	853487c377bee8175103a85bb00b8d9385bd4359	commit \| diff

mac80211: fix nested rtnl locking on ieee80211_reconfig

commit e669ba2d06c6195662601956454ac959892f0762 upstream.

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")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>