Commit b7f2405c authored Nov 23, 2016 by Kirtika Ruchandani Committed by Johannes Berg Dec 13, 2016

mac80211: Remove unused 'i' variable



Commit 5bcae31d (mac80211: implement multi-vif in-place reservations)
introduced ieee80211_vif_use_reserved_switch() with a counter variable
'i' that is set but not used. Compiling with W=1 gives the following
warning, fix it.
net/mac80211/chan.c: In function ‘ieee80211_vif_use_reserved_switch’:
net/mac80211/chan.c:1273:6: warning: variable ‘i’ set but not used [-Wunused-but-set-variable]

This is a harmless warning, and is only being fixed to reduce the
noise obtained with W=1 in the kernel.

Fixes: 5bcae31d ("mac80211: implement multi-vif in-place reservations")
Cc: Michal Kazior <michal.kazior@tieto.com>
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Kirtika Ruchandani <kirtika@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent fb803bec

net/mac80211/chan.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1270,7 +1270,7 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)
		struct ieee80211_sub_if_data sdata, sdata_tmp;
		struct ieee80211_chanctx ctx, ctx_tmp, *old_ctx;
		struct ieee80211_chanctx *new_ctx = NULL;
		int i, err, n_assigned, n_reserved, n_ready;
		int err, n_assigned, n_reserved, n_ready;
		int n_ctx = 0, n_vifs_switch = 0, n_vifs_assign = 0, n_vifs_ctxless = 0;

		lockdep_assert_held(&local->mtx);
		@@ -1391,8 +1391,6 @@ static int ieee80211_vif_use_reserved_switch(struct ieee80211_local *local)
		* Update all structures, values and pointers to point to new channel
		* context(s).
		*/

		i = 0;
		list_for_each_entry(ctx, &local->chanctx_list, list) {
		if (ctx->replace_state != IEEE80211_CHANCTX_REPLACES_OTHER)
		continue;

Admin message