Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / staging / rtl8192e / r8192E_wx.c

diff --git a/drivers/staging/rtl8192e/r8192E_wx.c b/drivers/staging/rtl8192e/r8192E_wx.c
index 2d20b9a9a2877078120ed6f672b2dbcd9d424a4f..adad91b0b6b105f3b81a1823c9f35959b3cbe65e 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_wx.c
+++ b/drivers/staging/rtl8192e/r8192E_wx.c
@@ -685,26 +685,16 @@ 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);
-                       setKey( dev,
-                               key_idx,                //EntryNo
-                               key_idx,                //KeyIndex
-                               KEY_TYPE_WEP40,         //KeyType
-                               zero_addr[key_idx],
-                               0,                      //DefaultKey
-                               hwkey);                 //KeyContent
+                       EnableHWSecurityConfig8192(priv);
+                       setKey(priv, key_idx, key_idx, KEY_TYPE_WEP40,
+                              zero_addr[key_idx], 0, hwkey);
                }
 
                else if(wrqu->encoding.length==0xd){
                        ieee->pairwise_key_type = KEY_TYPE_WEP104;
-                               EnableHWSecurityConfig8192(dev);
-                       setKey( dev,
-                               key_idx,                //EntryNo
-                               key_idx,                //KeyIndex
-                               KEY_TYPE_WEP104,        //KeyType
-                               zero_addr[key_idx],
-                               0,                      //DefaultKey
-                               hwkey);                 //KeyContent
+                               EnableHWSecurityConfig8192(priv);
+                       setKey(priv, key_idx, key_idx, KEY_TYPE_WEP104,
+                              zero_addr[key_idx], 0, hwkey);
                }
                else printk("wrong type in WEP, not WEP40 and WEP104\n");
        }
@@ -901,7 +891,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
 
@@ -909,37 +899,20 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
                {
                        if (ext->key_len == 13)
                                ieee->pairwise_key_type = alg = KEY_TYPE_WEP104;
-                       setKey( dev,
-                                       idx,//EntryNo
-                                       idx, //KeyIndex
-                                       alg,  //KeyType
-                                       zero, //MacAddr
-                                       0,              //DefaultKey
-                                       key);           //KeyContent
+                       setKey(priv, idx, idx, alg, zero, 0, key);
                }
                else if (group)
                {
                        ieee->group_key_type = alg;
-                       setKey( dev,
-                                       idx,//EntryNo
-                                       idx, //KeyIndex
-                                       alg,  //KeyType
-                                       broadcast_addr, //MacAddr
-                                       0,              //DefaultKey
-                                       key);           //KeyContent
+                       setKey(priv, idx, idx, alg, broadcast_addr, 0, key);
                }
                else //pairwise key
                {
                        if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) && ieee->pHTInfo->bCurrentHTSupport){
                                                        write_nic_byte(priv, 0x173, 1); //fix aes bug
                        }
-                       setKey( dev,
-                                       4,//EntryNo
-                                       idx, //KeyIndex
-                                       alg,  //KeyType
-                                       (u8*)ieee->ap_mac_addr, //MacAddr
-                                       0,              //DefaultKey
-                                       key);           //KeyContent
+                       setKey(priv, 4, idx, alg,
+                              (u8*)ieee->ap_mac_addr, 0, key);
                }
 
 
@@ -1033,7 +1006,7 @@ static int r8192_wx_adapter_power_status(struct net_device *dev,
        } else {
                //LZM for PS-Poll AID issue. 090429
                if(priv->ieee80211->state == IEEE80211_LINKED)
-                       LeisurePSLeave(dev);
+                       LeisurePSLeave(priv->ieee80211);
 
                priv->ps_force = true;
                pPSC->bLeisurePs = false;