summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
diff options
context:
space:
mode:
authorAlison Schofield2015-10-12 22:22:44 +0200
committerGreg Kroah-Hartman2015-10-13 06:02:25 +0200
commit3604af50a24ec45f76088e2da7bfb5758a5c1d7b (patch)
tree6cbdb9d24d1a5d54d0020b3b3a44c6953212d7e6 /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
parentStaging: wilc1000: linux_wlan: Remove NULL check before kfree (diff)
downloadkernel-qcow2-linux-3604af50a24ec45f76088e2da7bfb5758a5c1d7b.tar.gz
kernel-qcow2-linux-3604af50a24ec45f76088e2da7bfb5758a5c1d7b.tar.xz
kernel-qcow2-linux-3604af50a24ec45f76088e2da7bfb5758a5c1d7b.zip
staging: wilc1000: move open brace in line with control flow statement
Move open braces to be in line with "if" control flow statements. Addresses checkpatch.pl: ERROR: that open brace { should be on the previous line Signed-off-by: Alison Schofield <amsfield22@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_cfgoperations.c')
-rw-r--r--drivers/staging/wilc1000/wilc_wfi_cfgoperations.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6430bbfc13b9..004f4419a044 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1443,8 +1443,7 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
priv = wiphy_priv(wiphy);
- if (!pairwise)
- {
+ if (!pairwise) {
PRINT_D(CFG80211_DBG, "Getting group key idx: %x\n", key_index);
key_params.key = priv->wilc_gtk[key_index]->key;
@@ -1817,9 +1816,8 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
op_channel_attr_index = index;
index += buf[index + 1] + 3; /* ID,Length byte */
}
+ if (u8WLANChannel != INVALID_CHANNEL) {
- if (u8WLANChannel != INVALID_CHANNEL)
- {
/*Modify channel list attribute*/
if (channel_list_attr_index) {
PRINT_D(GENERIC_DBG, "Modify channel list attribute\n");
@@ -1872,9 +1870,8 @@ void WILC_WFI_CfgParseTxAction(u8 *buf, u32 len, bool bOperChan, u8 iftype)
op_channel_attr_index = index;
index += buf[index + 1] + 3; /* ID,Length byte */
}
+ if (u8WLANChannel != INVALID_CHANNEL && bOperChan) {
- if (u8WLANChannel != INVALID_CHANNEL && bOperChan)
- {
/*Modify channel list attribute*/
if (channel_list_attr_index) {
PRINT_D(GENERIC_DBG, "Modify channel list attribute\n");