Commit 37420932 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename EnableHWSecurityConfig8192

Use naming schema found in other rtlwifi devices.
Rename EnableHWSecurityConfig8192 to rtl92e_enable_hw_security_config.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66497f02
...@@ -1001,7 +1001,7 @@ void rtl92e_link_change(struct net_device *dev) ...@@ -1001,7 +1001,7 @@ void rtl92e_link_change(struct net_device *dev)
priv->ops->update_ratr_table(dev); priv->ops->update_ratr_table(dev);
if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
(KEY_TYPE_WEP104 == ieee->pairwise_key_type)) (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
} else { } else {
write_nic_byte(dev, 0x173, 0); write_nic_byte(dev, 0x173, 0);
} }
......
...@@ -36,7 +36,7 @@ void rtl92e_cam_reset(struct net_device *dev) ...@@ -36,7 +36,7 @@ void rtl92e_cam_reset(struct net_device *dev)
write_nic_dword(dev, RWCAM, ulcommand); write_nic_dword(dev, RWCAM, ulcommand);
} }
void EnableHWSecurityConfig8192(struct net_device *dev) void rtl92e_enable_hw_security_config(struct net_device *dev)
{ {
u8 SECR_value = 0x0; u8 SECR_value = 0x0;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
struct net_device; struct net_device;
void rtl92e_cam_reset(struct net_device *dev); void rtl92e_cam_reset(struct net_device *dev);
void EnableHWSecurityConfig8192(struct net_device *dev); void rtl92e_enable_hw_security_config(struct net_device *dev);
void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent); const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);
void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
......
...@@ -1350,7 +1350,7 @@ static void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1350,7 +1350,7 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
priv->RFChangeInProgress = false; priv->RFChangeInProgress = false;
spin_unlock_irqrestore(&priv->rf_ps_lock, flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == if (ieee->state == RTLLIB_LINKED && ieee->iw_mode ==
IW_MODE_INFRA) { IW_MODE_INFRA) {
...@@ -2375,7 +2375,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2375,7 +2375,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (is_zero_ether_addr(ieee->ap_mac_addr)) if (is_zero_ether_addr(ieee->ap_mac_addr))
ieee->iw_mode = IW_MODE_ADHOC; ieee->iw_mode = IW_MODE_ADHOC;
memcpy((u8 *)key, ipw->u.crypt.key, 16); memcpy((u8 *)key, ipw->u.crypt.key, 16);
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
set_swcam(dev, 4, ipw->u.crypt.idx, set_swcam(dev, 4, ipw->u.crypt.idx,
ieee->pairwise_key_type, ieee->pairwise_key_type,
(u8 *)ieee->ap_mac_addr, (u8 *)ieee->ap_mac_addr,
......
...@@ -750,12 +750,12 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -750,12 +750,12 @@ static int r8192_wx_set_enc(struct net_device *dev,
} }
if (wrqu->encoding.length == 0x5) { if (wrqu->encoding.length == 0x5) {
ieee->pairwise_key_type = KEY_TYPE_WEP40; ieee->pairwise_key_type = KEY_TYPE_WEP40;
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
} }
else if (wrqu->encoding.length == 0xd) { else if (wrqu->encoding.length == 0xd) {
ieee->pairwise_key_type = KEY_TYPE_WEP104; ieee->pairwise_key_type = KEY_TYPE_WEP104;
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
setKey(dev, key_idx, key_idx, KEY_TYPE_WEP104, setKey(dev, key_idx, key_idx, KEY_TYPE_WEP104,
zero_addr[key_idx], 0, hwkey); zero_addr[key_idx], 0, hwkey);
set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104, set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
...@@ -943,7 +943,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -943,7 +943,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40)) if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40))
alg = KEY_TYPE_WEP104; alg = KEY_TYPE_WEP104;
ieee->pairwise_key_type = alg; ieee->pairwise_key_type = alg;
EnableHWSecurityConfig8192(dev); rtl92e_enable_hw_security_config(dev);
} }
memcpy((u8 *)key, ext->key, 16); memcpy((u8 *)key, ext->key, 16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment