Skip to contentSkip to conversation

Patch "ath9k: fix misleading indentation" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 26, 2016

Subsystems (2)
Stable branch Qualcomm Atheros ATH9K wireless driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ath9k: fix misleading indentation

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ath9k-fix-misleading-indentation.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 362210e0dff4eb7bb36a9b34dbef3b39d779d95e Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Mon, 14 Mar 2016 15:18:37 +0100
Subject: ath9k: fix misleading indentation

From: Arnd Bergmann <[email protected]>

commit 362210e0dff4eb7bb36a9b34dbef3b39d779d95e upstream.

A cleanup patch in linux-3.18 moved around some code in the ath9k driver and left some code to be indented in a misleading way, made worse by the addition of some new code for p2p mode, as discovered by a new gcc-6 warning:

drivers/net/wireless/ath/ath9k/init.c: In function 'ath9k_set_hw_capab':
drivers/net/wireless/ath/ath9k/init.c:851:4: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]

    hw->wiphy->iface_combinations = if_comb;
    ^~

drivers/net/wireless/ath/ath9k/init.c:847:3: note: ...this 'if' clause, but it is not
if (ath9k_is_chanctx_enabled())
^~

The code is in fact correct, but the indentation is not, so I'm reformatting it as it should have been after the original cleanup.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 499afaccf6f3 ("ath9k: Isolate ath9k_use_chanctx module parameter")
Fixes eb61f9f623f7 ("ath9k: advertise p2p dev support when chanctx")
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/wireless/ath/ath9k/init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/init.c +2 -2
@@ -869,8 +869,8 @@ static void ath9k_set_hw_capab(struct at
 			hw->wiphy->interface_modes |=
 					BIT(NL80211_IFTYPE_P2P_DEVICE);
 
-			hw->wiphy->iface_combinations = if_comb;
-			hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
+		hw->wiphy->iface_combinations = if_comb;
+		hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
 	}
 
 	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/include-linux-kernel.h-change-abs-macro-so-it-uses-consistent-return-type.patch queue-4.4/ath9k-fix-misleading-indentation.patch queue-4.4/iwlegacy-avoid-warning-about-missing-braces.patch queue-4.4/kbuild-disable-maybe-uninitialized-warning-for-config_profile_all_branches.patch queue-4.4/net-caif-fix-misleading-indentation.patch queue-4.4/nouveau-fix-nv40_perfctr_next-cleanup-regression.patch queue-4.4/gcov-disable-wmaybe-uninitialized-warning.patch queue-4.4/am437x-vfpe-fix-typo-in-vpfe_get_app_input_index.patch queue-4.4/fix-build-warning-in-kernel-cpuset.c.patch queue-4.4/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch