diff options
Diffstat (limited to 'drivers/staging/ks7010')
-rw-r--r-- | drivers/staging/ks7010/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/ks7010/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 16 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/ks7010/Kconfig b/drivers/staging/ks7010/Kconfig index 0b9217674d5b..0987fdc2f70d 100644 --- a/drivers/staging/ks7010/Kconfig +++ b/drivers/staging/ks7010/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 config KS7010 tristate "KeyStream KS7010 SDIO support" depends on MMC && WIRELESS diff --git a/drivers/staging/ks7010/Makefile b/drivers/staging/ks7010/Makefile index 412e2105a3a5..009851a32310 100644 --- a/drivers/staging/ks7010/Makefile +++ b/drivers/staging/ks7010/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_KS7010) += ks7010.o ks7010-y := ks_hostif.o ks_wlan_net.o ks7010_sdio.o diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 122d4c0af363..e089366ed02a 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -361,6 +361,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 */ @@ -368,15 +370,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; |