evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath6kl: Remove redundant key_index check.

Browse source 
Less-than-zero comparison of an unsigned value is never true.

kvalo: remove WMI_MIN_KEY_INDEX altogether, it's useless

Signed-off-by: Vivek Natarajan <nataraja@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Vivek Natarajan 2011-12-29 16:18:39 +05:30 • committed by Kalle Valo
parent a10e2f2f6d
commit 792ecb3308
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/wireless/ath/ath6kl/cfg80211.c
View file

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

2
drivers/net/wireless/ath/ath6kl/main.c
View file

@ -363,7 +363,7 @@ static void ath6kl_install_static_wep_keys(struct ath6kl_vif *vif)
u8 index; u8 index;
u8 keyusage; u8 keyusage;
for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) { for (index = 0; index <= WMI_MAX_KEY_INDEX; index++) {
if (vif->wep_key_list[index].key_len) { if (vif->wep_key_list[index].key_len) {
keyusage = GROUP_USAGE; keyusage = GROUP_USAGE;
if (index == vif->def_txkey_index) if (index == vif->def_txkey_index)

1
drivers/net/wireless/ath/ath6kl/wmi.h
View file

@ -649,7 +649,6 @@ enum auth_mode {
WPA2_AUTH_CCKM = 0x40, WPA2_AUTH_CCKM = 0x40,
}; };
#define WMI_MIN_KEY_INDEX 0
#define WMI_MAX_KEY_INDEX 3 #define WMI_MAX_KEY_INDEX 3
#define WMI_MAX_KEY_LEN 32 #define WMI_MAX_KEY_LEN 32