Commit 6422c6ef authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman

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: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfd6b480
...@@ -332,16 +332,13 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, ...@@ -332,16 +332,13 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,
priv->nstats.rx_errors++; priv->nstats.rx_errors++;
return -EINVAL; return -EINVAL;
} }
if (((auth_type == TYPE_PMK1 if (((auth_type == TYPE_PMK1 &&
&& priv->wpa.pairwise_suite == priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) ||
IW_AUTH_CIPHER_TKIP) || (auth_type == TYPE_GMK1 (auth_type == TYPE_GMK1 &&
&& priv->wpa. priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP) ||
group_suite == (auth_type == TYPE_GMK2 &&
IW_AUTH_CIPHER_TKIP) priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP)) &&
|| (auth_type == TYPE_GMK2 priv->wpa.key[auth_type - 1].key_len) {
&& priv->wpa.group_suite ==
IW_AUTH_CIPHER_TKIP))
&& priv->wpa.key[auth_type - 1].key_len) {
DPRINTK(4, "TKIP: protocol=%04X: size=%u\n", DPRINTK(4, "TKIP: protocol=%04X: size=%u\n",
eth_proto, priv->rx_size); eth_proto, priv->rx_size);
/* MIC save */ /* MIC save */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment