mac80211: fix nested sdata lock for IBSS/CSA
authorSimon Wunderlich <sw@simonwunderlich.de>
Thu, 5 Dec 2013 18:54:43 +0000 (19:54 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 5 Dec 2013 19:15:19 +0000 (20:15 +0100)
This fixes a regression introduced by my patch "mac80211: don't cancel
csa finalize work within stop_ap", which added sdata locks to
ieee80211_csa_finalize_work() without removing the locking for
ieee80211_ibss_finish_csa(), which is called by the former, resulting
in a deadlock due to nested locking.

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ibss.c

Simple merge