diff options
| author | Colin Ian King <colin.king@canonical.com> | 2019-03-18 10:57:49 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-19 14:31:39 +0100 |
| commit | 7d6009f2821270831ffc6c29b3bf58891e3583d7 (patch) | |
| tree | c64adeddbfe9ab6a56fe2bcdf93b8132204e6473 /drivers/staging/ks7010 | |
| parent | 7f2c439642688998c58ba99addabf819e6df57d0 (diff) | |
| download | linux-7d6009f2821270831ffc6c29b3bf58891e3583d7.tar.bz2 | |
staging: ks7010: remove redundant auth_type check
The range check on auth_type is redundant as there is a prior
check on the auth_type values and the only way the block is entered
is if auth_type is one of TYPE_PMK1, TYPE_GMK1 and TYPE_GMK2. Hence
the auth_type check can be removed.
Detected by static analysis with cppcheck.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010')
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 06ebea0be118..31a536791d5c 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -362,6 +362,8 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, (auth_type == TYPE_GMK2 && priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP)) && key->key_len) { + int ret; + netdev_dbg(priv->net_dev, "TKIP: protocol=%04X: size=%u\n", eth_proto, priv->rx_size); /* MIC save */ @@ -369,15 +371,11 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, (priv->rxp) + ((priv->rx_size) - sizeof(recv_mic)), sizeof(recv_mic)); priv->rx_size = priv->rx_size - sizeof(recv_mic); - if (auth_type > 0 && auth_type < 4) { /* auth_type check */ - int ret; - - ret = michael_mic(key->rx_mic_key, - priv->rxp, priv->rx_size, - 0, mic); - if (ret < 0) - return ret; - } + + ret = michael_mic(key->rx_mic_key, priv->rxp, priv->rx_size, + 0, mic); + if (ret < 0) + return ret; if (memcmp(mic, recv_mic, sizeof(mic)) != 0) { now = jiffies; mic_failure = &priv->wpa.mic_failure; |