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>

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index 06ebea0..31a5367 100644 (file)
--- 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;