Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

[linux-drm-fsl-dcu.git] / net / mac80211 / chan.c

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 48e6d6f010cd0f26acd379fea0c601bf8d67e33f..a310e33972de8881bf4dd71bdff36d55fa966226 100644 (file)
--- 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)