From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755832AbcCNOTx (ORCPT ); Mon, 14 Mar 2016 10:19:53 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:50214 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755806AbcCNOTu (ORCPT ); Mon, 14 Mar 2016 10:19:50 -0400 From: Arnd Bergmann To: "David S. Miller" Cc: netdev@vger.kernel.org, Arnd Bergmann , QCA ath9k Development , Kalle Valo , linux-wireless@vger.kernel.org, ath9k-devel@venema.h4ckr.net, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] ath9k: fix misleading indentation Date: Mon, 14 Mar 2016 15:18:37 +0100 Message-Id: <1457965120-3155420-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457965120-3155420-1-git-send-email-arnd@arndb.de> References: <1457965120-3155420-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:4g4VEdoEvTm1BktcRGEJ40qR4AWAbVEXmfu5fc+UmiWjertll3q WQZ4aGSwIy9xaqGHYDgaNhPJFecKo6VG7VGTvmpLuOYHuiuV/gkqj+7k917nhkRsDEOGVKW VyJyKdXffbWwOqiIKE4t+u/3URjQGJ0DVwYvjvFviJwGQWxtvS9IxAYF/Uw/dc5DX6KV9Qz IDNIyGKRYzmqRrxNinkaQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:0IqC/R7nRDE=:64b1DqmdL7LhDE3iFKvemd noHDLBzdvWyzj1TEIy1WwTH0KmmQqXlp4z9t7QnfNp67+EltVegytGvFGxBkKa68cN7l9i+k6 VNElbosUTmDmuPrvJU5bkXXVXUNZEN3XF+v/36ynLZNyizOEFNnClpvP6ulyoytUVbsr0K4w+ yofnIGNA5O8ffJFTpG7B6SJr0rpwhEuJMBm/Qhuyi+15IN1CH8hEvpRuJgD7E2kqjwqMWDebO je+KgD2lgHBNuY1rwOR243HrEf5P865V4y1ARV3kYI5h8ZRJPkMLutb6S1P4YeFdMigE0LiN9 hsTgQF7MwkBXOkTq24taimhJrghYiaVzxXtf2vHFjRKLBADERI1k02muef0Q1hhBYY9w2vutj PWw2/+JSV2SpEOJ1AOX+mLaWc1eZiglQ7ZmsgTjVwY4k6ufXF8bBKfl6f4/SCf2VXUc56yLhs Zo4lmtDx2Sg1bZ7YgEG2As7/HX1iHxP/zfV3iwjdWQo7Juc5nAh5TBNJR/myuPGBrRENZnG4B uZqY5GdFVHPaoS/S0dt4TNaNp6QsKeE26BVpIGU+flb40vQ8mdTywnxCx1BEmvAOWe8EfvudA Jlse0+hrewfZDLPx3Ki+UcYMfLc6OR0a6JQstxlIrUedkjrLUvuk28NGv6JV7Ob3C8qXDQJR3 oy2KrsY8blH8xUbwQKiEoSPy1int+vkbXMQMfmzt6yuvDEQclBQHTWpd/HJBqF+t4708= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 499afaccf6f3 ("ath9k: Isolate ath9k_use_chanctx module parameter") Fixes: eb61f9f623f7 ("ath9k: advertise p2p dev support when chanctx") --- drivers/net/wireless/ath/ath9k/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index d4e0ac946c3a..1c226d63bb03 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -848,8 +848,8 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 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; -- 2.7.0