From: Simon Wunderlich <sw@simonwunderlich.de>
Date: Thu, 5 Dec 2013 18:54:43 +0000 (+0100)
Subject: mac80211: fix nested sdata lock for IBSS/CSA
X-Git-Tag: v3.14-rc1~94^2~334^2^2~74
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bafdc614a1f4f8be8cde41b8ab10ac17e67c1837;p=pandora-kernel.git

mac80211: fix nested sdata lock for IBSS/CSA

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>
---

Reading git-diff-tree failed