From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 051/102] staging: rtl8192e: Rename set_swcam
Date: Sun, 19 Jul 2015 19:28:04 +0200 [thread overview]
Message-ID: <1437326935-24428-52-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1437326935-24428-1-git-send-email-mateusz.kulikowski@gmail.com>
Use naming schema found in other rtlwifi devices.
Rename set_swcam to rtl92e_set_swcam.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 5 +++--
drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 5 +++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 29 +++++++++++++++-------------
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 14 +++++++-------
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 8e4da40..9c14286 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -68,8 +68,9 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
write_nic_byte(dev, SECR, SECR_value);
}
-void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
- const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent, u8 is_mesh)
+void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
+ u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
+ u32 *KeyContent, u8 is_mesh)
{
struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index a26f3f5..9ef8b36 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -33,8 +33,9 @@ void rtl92e_enable_hw_security_config(struct net_device *dev);
void rtl92e_set_key(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,
- const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent, u8 is_mesh);
+void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
+ u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
+ u32 *KeyContent, u8 is_mesh);
void rtl92e_cam_restore(struct net_device *dev);
#endif
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 00f38eb..2a34e4d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2376,20 +2376,22 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ieee->iw_mode = IW_MODE_ADHOC;
memcpy((u8 *)key, ipw->u.crypt.key, 16);
rtl92e_enable_hw_security_config(dev);
- set_swcam(dev, 4, ipw->u.crypt.idx,
- ieee->pairwise_key_type,
- (u8 *)ieee->ap_mac_addr,
- 0, key, 0);
+ rtl92e_set_swcam(dev, 4,
+ ipw->u.crypt.idx,
+ ieee->pairwise_key_type,
+ (u8 *)ieee->ap_mac_addr,
+ 0, key, 0);
rtl92e_set_key(dev, 4, ipw->u.crypt.idx,
ieee->pairwise_key_type,
(u8 *)ieee->ap_mac_addr,
0, key);
if (ieee->iw_mode == IW_MODE_ADHOC) {
- set_swcam(dev, ipw->u.crypt.idx,
- ipw->u.crypt.idx,
- ieee->pairwise_key_type,
- (u8 *)ieee->ap_mac_addr,
- 0, key, 0);
+ rtl92e_set_swcam(dev,
+ ipw->u.crypt.idx,
+ ipw->u.crypt.idx,
+ ieee->pairwise_key_type,
+ (u8 *)ieee->ap_mac_addr,
+ 0, key, 0);
rtl92e_set_key(dev,
ipw->u.crypt.idx,
ipw->u.crypt.idx,
@@ -2420,10 +2422,11 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ieee->group_key_type = KEY_TYPE_NA;
if (ieee->group_key_type) {
- set_swcam(dev, ipw->u.crypt.idx,
- ipw->u.crypt.idx,
- ieee->group_key_type,
- broadcast_addr, 0, key, 0);
+ rtl92e_set_swcam(dev, ipw->u.crypt.idx,
+ ipw->u.crypt.idx,
+ ieee->group_key_type,
+ broadcast_addr, 0, key,
+ 0);
rtl92e_set_key(dev, ipw->u.crypt.idx,
ipw->u.crypt.idx,
ieee->group_key_type,
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index b2a4bf1..1b29f14 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -758,8 +758,8 @@ static int r8192_wx_set_enc(struct net_device *dev,
rtl92e_enable_hw_security_config(dev);
rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104,
zero_addr[key_idx], 0, hwkey);
- set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
- zero_addr[key_idx], 0, hwkey, 0);
+ rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
+ zero_addr[key_idx], 0, hwkey, 0);
} else {
netdev_info(dev,
"wrong type in WEP, not WEP40 and WEP104\n");
@@ -951,21 +951,21 @@ static int r8192_wx_set_enc_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);
- set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
+ rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
} else if (group) {
ieee->group_key_type = alg;
rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0,
key);
- set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
- key, 0);
+ rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
+ key, 0);
} else {
if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
ieee->pHTInfo->bCurrentHTSupport)
write_nic_byte(dev, 0x173, 1);
rtl92e_set_key(dev, 4, idx, alg,
(u8 *)ieee->ap_mac_addr, 0, key);
- 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, 0, key, 0);
}
--
1.8.4.1
next prev parent reply other threads:[~2015-07-19 17:30 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-19 17:27 [PATCH 000/102] staging: rtl8192e: Function names cleanup Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 001/102] staging: rtl8192e: Rename PHY_RF8256_Config Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 002/102] staging: rtl8192e: Rename PHY_SetRF8256Bandwidth Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 003/102] staging: rtl8192e: Rename PHY_SetRF8256CCKTxPower Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 004/102] staging: rtl8192e: Rename PHY_SetRF8256OFDMTxPower Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 005/102] staging: rtl8192e: Rename cmpk_message_handle_tx Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 006/102] staging: rtl8192e: Rename rtl8192_adapter_start Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 007/102] staging: rtl8192e: Rename rtl8192_AllowAllDestAddr Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 008/102] staging: rtl8192e: Rename rtl8192_ClearInterrupt Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 009/102] staging: rtl8192e: Rename rtl8192_DisableInterrupt Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 010/102] staging: rtl8192e: Rename rtl8192_EnableInterrupt Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 011/102] staging: rtl8192e: Rename rtl8192_enable_rx Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 012/102] staging: rtl8192e: Rename rtl8192_enable_tx Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 013/102] staging: rtl8192e: Rename rtl8192e_SetHwReg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 014/102] staging: rtl8192e: Rename rtl8192e_start_beacon Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 015/102] staging: rtl8192e: Rename rtl8192_get_eeprom_size Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 016/102] staging: rtl8192e: Rename rtl8192_GetHalfNmodeSupportByAPs Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 017/102] staging: rtl8192e: Rename rtl8192_GetNmodeSupportBySecCfg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 018/102] staging: rtl8192e: Rename rtl8192_HalRxCheckStuck Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 019/102] staging: rtl8192e: Rename rtl8192_halt_adapter Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 020/102] staging: rtl8192e: Rename rtl8192_HalTxCheckStuck Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 021/102] staging: rtl8192e: Rename rtl8192_InitializeVariables Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 022/102] staging: rtl8192e: Rename rtl8192_interrupt_recognized Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 023/102] staging: rtl8192e: Rename rtl8192_link_change Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 024/102] staging: rtl8192e: Rename rtl8192_rx_query_status_desc Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 025/102] staging: rtl8192e: Rename rtl8192_tx_fill_cmd_desc Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 026/102] staging: rtl8192e: Rename rtl8192_tx_fill_desc Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 027/102] staging: rtl8192e: Rename rtl8192_update_ratr_table Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 028/102] staging: rtl8192e: Rename firmware_init_param Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 029/102] staging: rtl8192e: Rename InitialGain819xPci Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 030/102] staging: rtl8192e: Rename PHY_ScanOperationBackup8192 Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 031/102] staging: rtl8192e: Rename PHY_SetRtl8192eRfOff Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 032/102] staging: rtl8192e: Rename rtl8192_BBConfig Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 033/102] staging: rtl8192e: Rename rtl8192_phy_checkBBAndRF Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 034/102] staging: rtl8192e: Rename rtl8192_phy_CheckIsLegalRFPath Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 035/102] staging: rtl8192e: Rename rtl8192_phy_configmac Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 036/102] staging: rtl8192e: Rename rtl8192_phy_ConfigRFWithHeaderFile Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 037/102] staging: rtl8192e: Rename rtl8192_phy_getTxPower Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 038/102] staging: rtl8192e: Rename rtl8192_phy_QueryRFReg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 039/102] staging: rtl8192e: Rename rtl8192_phy_RFConfig Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 040/102] staging: rtl8192e: Rename rtl8192_phy_SetRFReg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 041/102] staging: rtl8192e: Rename rtl8192_phy_setTxPower Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 042/102] staging: rtl8192e: Rename rtl8192_phy_SwChnl Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 043/102] staging: rtl8192e: Rename rtl8192_QueryBBReg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 044/102] staging: rtl8192e: Rename rtl8192_setBBreg Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 045/102] staging: rtl8192e: Rename rtl8192_SetBWMode Mateusz Kulikowski
2015-07-19 17:27 ` [PATCH 046/102] staging: rtl8192e: Rename SetRFPowerState Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 047/102] staging: rtl8192e: Rename CamResetAllEntry Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 048/102] staging: rtl8192e: Rename CamRestoreAllEntry Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 049/102] staging: rtl8192e: Rename EnableHWSecurityConfig8192 Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 050/102] staging: rtl8192e: Rename setKey Mateusz Kulikowski
2015-07-19 17:28 ` Mateusz Kulikowski [this message]
2015-07-19 17:28 ` [PATCH 052/102] staging: rtl8192e: Rename check_rfctrl_gpio_timer Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 053/102] staging: rtl8192e: Rename MgntActSet_RF_State Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 054/102] staging: rtl8192e: Rename NicIFDisableNIC Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 055/102] staging: rtl8192e: Rename NicIFEnableNIC Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 056/102] staging: rtl8192e: Rename read_nic_byte Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 057/102] staging: rtl8192e: Rename read_nic_dword Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 058/102] staging: rtl8192e: Rename read_nic_word Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 059/102] staging: rtl8192e: Rename rtl8192_commit Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 060/102] staging: rtl8192e: Rename rtl8192_config_rate Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 061/102] staging: rtl8192e: Rename rtl8192_irq_disable Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 062/102] staging: rtl8192e: Rename rtl8192_irq_enable Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 063/102] staging: rtl8192e: Rename rtl8192_pci_resetdescring Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 064/102] staging: rtl8192e: Rename rtl8192_record_rxdesc_forlateruse Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 065/102] staging: rtl8192e: Rename rtl8192_rx_enable Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 066/102] staging: rtl8192e: Rename rtl8192_SetWirelessMode Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 067/102] staging: rtl8192e: Rename rtl8192_tx_enable Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 068/102] staging: rtl8192e: Rename rtl819x_evm_dbtopercentage Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 069/102] staging: rtl8192e: Rename rtl819x_query_rxpwrpercentage Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 070/102] staging: rtl8192e: Rename rtl819x_translate_todbm Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 071/102] staging: rtl8192e: Rename rtl819x_UpdateRxPktTimeStamp Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 072/102] staging: rtl8192e: Rename rtl819x_update_rxsignalstatistics8190pci Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 073/102] staging: rtl8192e: Rename write_nic_byte Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 074/102] staging: rtl8192e: Rename write_nic_dword Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 075/102] staging: rtl8192e: Rename write_nic_word Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 076/102] staging: rtl8192e: Rename deinit_hal_dm Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 077/102] staging: rtl8192e: Rename dm_backup_dynamic_mechanism_state Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 078/102] staging: rtl8192e: Rename dm_cck_txpower_adjust Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 079/102] staging: rtl8192e: Rename dm_init_edca_turbo Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 080/102] staging: rtl8192e: Rename dm_initialize_txpower_tracking Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 081/102] staging: rtl8192e: Rename dm_restore_dynamic_mechanism_state Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 082/102] staging: rtl8192e: Rename dm_rf_pathcheck_workitemcallback Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 083/102] staging: rtl8192e: Rename dm_txpower_trackingcallback Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 084/102] staging: rtl8192e: Rename hal_dm_watchdog Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 085/102] staging: rtl8192e: Rename init_rate_adaptive Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 086/102] staging: rtl8192e: Rename eprom_read Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 087/102] staging: rtl8192e: Rename rtl8192_pci_findadapter Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 088/102] staging: rtl8192e: Rename rtl8192E_resume Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 089/102] staging: rtl8192e: Rename rtl8192E_suspend Mateusz Kulikowski
2015-07-19 17:28 ` [PATCH 090/102] staging: rtl8192e: Rename IPSEnter Mateusz Kulikowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437326935-24428-52-git-send-email-mateusz.kulikowski@gmail.com \
--to=mateusz.kulikowski@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®