|
@@ -524,8 +524,7 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
|
|
|
(vif->prwise_crypto == WEP_CRYPT)) {
|
|
|
struct ath6kl_key *key = NULL;
|
|
|
|
|
|
- if (sme->key_idx < WMI_MIN_KEY_INDEX ||
|
|
|
- sme->key_idx > WMI_MAX_KEY_INDEX) {
|
|
|
+ if (sme->key_idx > WMI_MAX_KEY_INDEX) {
|
|
|
ath6kl_err("key index %d out of bounds\n",
|
|
|
sme->key_idx);
|
|
|
up(&ar->sem);
|
|
@@ -997,7 +996,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
params->key);
|
|
|
}
|
|
|
|
|
|
- if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
|
|
|
+ if (key_index > WMI_MAX_KEY_INDEX) {
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
|
|
|
"%s: key index %d out of bounds\n", __func__,
|
|
|
key_index);
|
|
@@ -1115,7 +1114,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
if (!ath6kl_cfg80211_ready(vif))
|
|
|
return -EIO;
|
|
|
|
|
|
- if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
|
|
|
+ if (key_index > WMI_MAX_KEY_INDEX) {
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
|
|
|
"%s: key index %d out of bounds\n", __func__,
|
|
|
key_index);
|
|
@@ -1148,7 +1147,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
if (!ath6kl_cfg80211_ready(vif))
|
|
|
return -EIO;
|
|
|
|
|
|
- if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
|
|
|
+ if (key_index > WMI_MAX_KEY_INDEX) {
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
|
|
|
"%s: key index %d out of bounds\n", __func__,
|
|
|
key_index);
|
|
@@ -1184,7 +1183,7 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,
|
|
|
if (!ath6kl_cfg80211_ready(vif))
|
|
|
return -EIO;
|
|
|
|
|
|
- if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
|
|
|
+ if (key_index > WMI_MAX_KEY_INDEX) {
|
|
|
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
|
|
|
"%s: key index %d out of bounds\n",
|
|
|
__func__, key_index);
|