diff options
| author | Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-07-19 20:28:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-23 07:24:20 +0300 |
| commit | 3742093268faec364254966286b69fa4801bbc01 (patch) | |
| tree | 6e7f56b508bb46460f25f23c3022ea990da757e8 /drivers | |
| parent | 66497f0223cb23b572e360d32ad5473f618c5e57 (diff) | |
| download | linux-3742093268faec364254966286b69fa4801bbc01.tar.xz | |
staging: rtl8192e: Rename EnableHWSecurityConfig8192
Use naming schema found in other rtlwifi devices.
Rename EnableHWSecurityConfig8192 to rtl92e_enable_hw_security_config.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index c7260ef80b76..ead3e2208fb7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1001,7 +1001,7 @@ void rtl92e_link_change(struct net_device *dev) priv->ops->update_ratr_table(dev); if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); } else { write_nic_byte(dev, 0x173, 0); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c index 66e06bea21d3..39640dda4acf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -36,7 +36,7 @@ void rtl92e_cam_reset(struct net_device *dev) 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; struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h index 001ff4021a60..b0619b77b1f0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h @@ -29,7 +29,7 @@ struct net_device; 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, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent); void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index b12256ce44b4..df3b846aefa3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1350,7 +1350,7 @@ RESET_START: priv->RFChangeInProgress = false; spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA) { @@ -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)) ieee->iw_mode = IW_MODE_ADHOC; memcpy((u8 *)key, ipw->u.crypt.key, 16); - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); set_swcam(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8 *)ieee->ap_mac_addr, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index df7cf084a76b..4795c727bb5b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -750,12 +750,12 @@ static int r8192_wx_set_enc(struct net_device *dev, } if (wrqu->encoding.length == 0x5) { ieee->pairwise_key_type = KEY_TYPE_WEP40; - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); } else if (wrqu->encoding.length == 0xd) { ieee->pairwise_key_type = KEY_TYPE_WEP104; - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); setKey(dev, key_idx, key_idx, KEY_TYPE_WEP104, zero_addr[key_idx], 0, hwkey); 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, if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40)) alg = KEY_TYPE_WEP104; ieee->pairwise_key_type = alg; - EnableHWSecurityConfig8192(dev); + rtl92e_enable_hw_security_config(dev); } memcpy((u8 *)key, ext->key, 16); |
