diff options
| author | Tobin C. Harding <me@tobin.cc> | 2017-03-13 17:38:18 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-14 06:20:06 +0800 |
| commit | 6422c6efb3b1d296ee2b79b6961a02952a75ee53 (patch) | |
| tree | 37792096d21a95341d702959d81af3dd73ef1e63 /drivers/staging/ks7010 | |
| parent | dfd6b480c9e63d520aac932b2ed1a729a1f4a6a6 (diff) | |
| download | op-kernel-dev-6422c6efb3b1d296ee2b79b6961a02952a75ee53.zip op-kernel-dev-6422c6efb3b1d296ee2b79b6961a02952a75ee53.tar.gz | |
staging: ks7010: fix line continuations
Checkpatch emits CHECK: Logical continuations should be on the
previous line. Also the same code section causes checkpatch to emit
WARNING: Avoid multiple line dereference.
Move logical line continuations onto the previous line. Move multiple
line dereferences onto single line.
Make these two changes in a single patch to give review a chance
to critique the final layout of the *complex* logical statement.
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010')
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 54ff06d..461482b 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -332,16 +332,13 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, priv->nstats.rx_errors++; return -EINVAL; } - if (((auth_type == TYPE_PMK1 - && priv->wpa.pairwise_suite == - IW_AUTH_CIPHER_TKIP) || (auth_type == TYPE_GMK1 - && priv->wpa. - group_suite == - IW_AUTH_CIPHER_TKIP) - || (auth_type == TYPE_GMK2 - && priv->wpa.group_suite == - IW_AUTH_CIPHER_TKIP)) - && priv->wpa.key[auth_type - 1].key_len) { + if (((auth_type == TYPE_PMK1 && + priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) || + (auth_type == TYPE_GMK1 && + priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP) || + (auth_type == TYPE_GMK2 && + priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP)) && + priv->wpa.key[auth_type - 1].key_len) { DPRINTK(4, "TKIP: protocol=%04X: size=%u\n", eth_proto, priv->rx_size); /* MIC save */ |
