summaryrefslogtreecommitdiffstats
path: root/net/mac80211/chan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-22 19:58:36 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-05-22 19:58:36 +0200
commit40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 (patch)
treea65eb4adca8e37ed7335345e94e36918593f7f92 /net/mac80211/chan.c
parentMerge tag 'nfc-next-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentcfg80211: allow RSSI compensation (diff)
downloadlinux-40a10fd740a4d5a9f3da255cf8dae48c6723d1a6.tar.xz
linux-40a10fd740a4d5a9f3da255cf8dae48c6723d1a6.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r--net/mac80211/chan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 48e6d6f010cd..a310e33972de 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -855,7 +855,7 @@ static void
__ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
bool clear)
{
- struct ieee80211_local *local = sdata->local;
+ struct ieee80211_local *local __maybe_unused = sdata->local;
struct ieee80211_sub_if_data *vlan;
struct ieee80211_chanctx_conf *conf;
@@ -871,7 +871,7 @@ __ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
* to a channel context that has already been freed.
*/
conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
- lockdep_is_held(&local->chanctx_mtx));
+ lockdep_is_held(&local->chanctx_mtx));
WARN_ON(!conf);
if (clear)