diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2014-04-09 21:31:13 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-05 16:03:42 +0200 |
| commit | 33926eb7785ac7ce7d45d1ae5afb0780a4270342 (patch) | |
| tree | 3b5952c1bc1a766e2ecd25e29b344a14a8f5268d /net/mac80211 | |
| parent | mac80211: move TDLS code to another file (diff) | |
| download | linux-dev-33926eb7785ac7ce7d45d1ae5afb0780a4270342.tar.xz linux-dev-33926eb7785ac7ce7d45d1ae5afb0780a4270342.zip | |
mac80211: mark local variable __maybe_unused
The 'local' variable in __ieee80211_vif_copy_chanctx_to_vlans()
is only used/needed when lockdep is compiled in, mark it as such
to avoid compile warnings in the other case.
While at it, fix some indentation where it's used.
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/chan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index d8b1b8614842..3702d642cd8f 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -848,7 +848,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; @@ -864,7 +864,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) |