mac80211: modify beacon using sdata/wdev-lock, not rtnl lock
authorSimon Wunderlich <sw@simonwunderlich.de>
Thu, 21 Nov 2013 17:19:50 +0000 (18:19 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 2 Dec 2013 10:51:53 +0000 (11:51 +0100)
The csa finalize worker needs to change the beacon information (for
different modes). These are normally protected under rtnl lock, but the
csa finalize worker is called by drivers and should not acquire the RTNL
lock. Therefore change access protection for beacons to sdata/wdev lock.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
[fix sdata_dereference]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h

Simple merge
Simple merge