]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ath9k: fix misleading indentation
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Mar 2016 14:18:37 +0000 (15:18 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Mar 2016 17:09:49 +0000 (13:09 -0400)
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 <arnd@arndb.de>
Fixes: 499afaccf6f3 ("ath9k: Isolate ath9k_use_chanctx module parameter")
Fixes: eb61f9f623f7 ("ath9k: advertise p2p dev support when chanctx")
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/ath/ath9k/init.c

index d4e0ac946c3a076838b62cb1d8cabbf346bffcd6..1c226d63bb0362d44e3420758909592f08287a12 100644 (file)
@@ -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;