summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtllib_wx.c
diff options
context:
space:
mode:
authorSean MacLennan <seanm@seanm.ca>2011-12-19 23:19:23 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-22 13:48:59 -0800
commit184f1938b29310a0df4298b57a7241832cb0813c (patch)
tree709bd0cb5d51452fad689e54f2da8bb4e56c6340 /drivers/staging/rtl8192e/rtllib_wx.c
parent70cd533763aa9804bc99a9e6cb79720fa1717770 (diff)
downloadlinux-184f1938b29310a0df4298b57a7241832cb0813c.tar.bz2
staging/rtl8192e: Add lib80211.h to rtllib.h
Add lib80211.h header file to rtllib.h and get it compiling. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_wx.c')
-rw-r--r--drivers/staging/rtl8192e/rtllib_wx.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 5e81734fbe91..48afd4cb5170 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -312,7 +312,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
key = erq->flags & IW_ENCODE_INDEX;
if (key) {
- if (key > WEP_KEYS)
+ if (key > NUM_WEP_KEYS)
return -EINVAL;
key--;
key_provided = 1;
@@ -334,7 +334,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
/* Check all the keys to see if any are still configured,
* and if no key index was provided, de-init them all */
- for (i = 0; i < WEP_KEYS; i++) {
+ for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ieee->crypt[i] != NULL) {
if (key_provided)
break;
@@ -343,7 +343,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
}
}
- if (i == WEP_KEYS) {
+ if (i == NUM_WEP_KEYS) {
sec.enabled = 0;
sec.level = SEC_LEVEL_0;
sec.flags |= SEC_ENABLED | SEC_LEVEL;
@@ -486,7 +486,7 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
key = erq->flags & IW_ENCODE_INDEX;
if (key) {
- if (key > WEP_KEYS)
+ if (key > NUM_WEP_KEYS)
return -EINVAL;
key--;
} else {
@@ -534,7 +534,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
};
idx = encoding->flags & IW_ENCODE_INDEX;
if (idx) {
- if (idx < 1 || idx > WEP_KEYS)
+ if (idx < 1 || idx > NUM_WEP_KEYS)
return -EINVAL;
idx--;
} else{
@@ -559,11 +559,11 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
if (*crypt)
rtllib_crypt_delayed_deinit(ieee, crypt);
- for (i = 0; i < WEP_KEYS; i++) {
+ for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ieee->crypt[i] != NULL)
break;
}
- if (i == WEP_KEYS) {
+ if (i == NUM_WEP_KEYS) {
sec.enabled = 0;
sec.level = SEC_LEVEL_0;
sec.flags |= SEC_LEVEL;
@@ -692,7 +692,7 @@ int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
idx = encoding->flags & IW_ENCODE_INDEX;
if (idx) {
- if (idx < 1 || idx > WEP_KEYS)
+ if (idx < 1 || idx > NUM_WEP_KEYS)
return -EINVAL;
idx--;
} else {