Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / staging / rtl8192e / rtl8192e / rtl_wx.c

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 88975dc804c6f15da88fad6ae192971d6af6ce3b..1897988525686a422fc825b07f279b38d930ca29 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -428,7 +428,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
 
                        ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
 
-                       rtllib_start_scan_syncro(priv->rtllib, 0);
+                       rtllib_start_scan_syncro(priv->rtllib);
 
                        ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);
                }
@@ -712,7 +712,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev,
                        rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104,
                                       zero_addr[key_idx], 0, hwkey);
                        rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
-                                        zero_addr[key_idx], 0, hwkey, 0);
+                                        zero_addr[key_idx], hwkey);
                } else {
                        netdev_info(dev,
                                    "wrong type in WEP, not WEP40 and WEP104\n");
@@ -857,21 +857,19 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,
                        if (ext->key_len == 13)
                                ieee->pairwise_key_type = alg = KEY_TYPE_WEP104;
                        rtl92e_set_key(dev, idx, idx, alg, zero, 0, key);
-                       rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, zero, key);
                } else if (group) {
                        ieee->group_key_type = alg;
                        rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0,
                                       key);
-                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
-                                        key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, key);
                } else {
                        if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
                             ieee->ht_info->bCurrentHTSupport)
                                rtl92e_writeb(dev, 0x173, 1);
                        rtl92e_set_key(dev, 4, idx, alg,
                                       (u8 *)ieee->ap_mac_addr, 0, key);
-                       rtl92e_set_swcam(dev, 4, idx, alg,
-                                        (u8 *)ieee->ap_mac_addr, 0, key, 0);
+                       rtl92e_set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, key);
                }
        }