From: Mike McCormack <[email protected]>
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/rtl8192e/r8192E.h | 2 +-
drivers/staging/rtl8192e/r8192E_core.c | 7 +++----
drivers/staging/rtl8192e/r8192E_wx.c | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8192e/r8192E.h
b/drivers/staging/rtl8192e/r8192E.h
index 4aefbc3..26b2e58 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -1121,7 +1121,7 @@ int rtl8192_up(struct net_device *dev);
void rtl8192_commit(struct r8192_priv *priv);
void write_phy(struct net_device *dev, u8 adr, u8 data);
void CamResetAllEntry(struct r8192_priv *priv);
-void EnableHWSecurityConfig8192(struct net_device *dev);
+void EnableHWSecurityConfig8192(struct r8192_priv *priv);
void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent );
void firmware_init_param(struct net_device *dev);
RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8*
codevirtualaddress, u32 packettype, u32 buffer_len);
diff --git a/drivers/staging/rtl8192e/r8192E_core.c
b/drivers/staging/rtl8192e/r8192E_core.c
index 93e9e67..1028d43 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -1488,7 +1488,7 @@ static void rtl8192_link_change(struct net_device *dev)
//add this as in pure N mode, wep encryption will use software
way, but there is no chance to set this as wep will not set group key in wext.
WB.2008.07.08
if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
(KEY_TYPE_WEP104 == ieee->pairwise_key_type))
- EnableHWSecurityConfig8192(dev);
+ EnableHWSecurityConfig8192(priv);
}
else
{
@@ -3561,7 +3561,7 @@ static void r8192e_set_hw_key(struct r8192_priv *priv,
struct ieee_param *ipw)
if (ieee->pairwise_key_type) {
memcpy(key, ipw->u.crypt.key, 16);
- EnableHWSecurityConfig8192(dev);
+ EnableHWSecurityConfig8192(priv);
/*
* We fill both index entry and 4th entry for pairwise
* key as in IPW interface, adhoc will only get here,
@@ -4913,10 +4913,9 @@ out_unlock:
return ret;
}
-void EnableHWSecurityConfig8192(struct net_device *dev)
+void EnableHWSecurityConfig8192(struct r8192_priv *priv)
{
u8 SECR_value = 0x0;
- struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
struct ieee80211_device* ieee = priv->ieee80211;
SECR_value = SCR_TxEncEnable | SCR_RxDecEnable;
diff --git a/drivers/staging/rtl8192e/r8192E_wx.c
b/drivers/staging/rtl8192e/r8192E_wx.c
index 2d20b9a..b51842b 100644
--- a/drivers/staging/rtl8192e/r8192E_wx.c
+++ b/drivers/staging/rtl8192e/r8192E_wx.c
@@ -685,7 +685,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
//printk("-------====>length:%d, key_idx:%d, flag:%x\n",
wrqu->encoding.length, key_idx, wrqu->encoding.flags);
if(wrqu->encoding.length==0x5){
ieee->pairwise_key_type = KEY_TYPE_WEP40;
- EnableHWSecurityConfig8192(dev);
+ EnableHWSecurityConfig8192(priv);
setKey( dev,
key_idx, //EntryNo
key_idx, //KeyIndex
@@ -697,7 +697,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
else if(wrqu->encoding.length==0xd){
ieee->pairwise_key_type = KEY_TYPE_WEP104;
- EnableHWSecurityConfig8192(dev);
+ EnableHWSecurityConfig8192(priv);
setKey( dev,
key_idx, //EntryNo
key_idx, //KeyIndex
@@ -901,7 +901,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40) )
alg = KEY_TYPE_WEP104;
ieee->pairwise_key_type = alg;
- EnableHWSecurityConfig8192(dev);
+ EnableHWSecurityConfig8192(priv);
}
memcpy((u8*)key, ext->key, 16); //we only get 16 bytes key.why?
WB 2008.7.1
--
1.7.4.1
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
