* [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk
@ 2015-11-08 7:48 Chaehyun Lim
2015-11-08 7:48 ` [PATCH 02/32] staging: wilc1000: fix argument name " Chaehyun Lim
` (30 more replies)
0 siblings, 31 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes return type of host_int_add_ptk from s32 to int.
The result variable gets return value from wilc_mq_send that has return
type of int. It should be changed return type of this function as well
as data type of result variable.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d5b7725..082450f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3207,12 +3207,12 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
return result;
}
-s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
+int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
u8 u8PtkKeylen, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx)
{
- s32 result = 0;
+ int result = 0;
struct host_if_msg msg;
u8 u8KeyLen = u8PtkKeylen;
u32 i;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 57e1d42..ee9c8fe 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -311,7 +311,7 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,
int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
const u8 *key, u8 len, u8 index, u8 mode,
enum AUTHTYPE auth_type);
-s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk,
+int host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk,
u8 u8PtkKeylen, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 02/32] staging: wilc1000: fix argument name of host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
@ 2015-11-08 7:48 ` Chaehyun Lim
2015-11-08 7:48 ` [PATCH 03/32] staging: wilc1000: rename pu8Ptk in host_int_add_ptk Chaehyun Lim
` (29 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes struct host_if_drv of host_int_add_ptk function
declaration from hWFIDrv to hif_drv.
With this change, first parameter of this function declaration and
definition has same name as hif_drv.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ee9c8fe..12deff4 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -311,7 +311,7 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,
int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
const u8 *key, u8 len, u8 index, u8 mode,
enum AUTHTYPE auth_type);
-int host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk,
+int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
u8 u8PtkKeylen, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 03/32] staging: wilc1000: rename pu8Ptk in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
2015-11-08 7:48 ` [PATCH 02/32] staging: wilc1000: fix argument name " Chaehyun Lim
@ 2015-11-08 7:48 ` Chaehyun Lim
2015-11-08 7:48 ` [PATCH 04/32] staging: wilc1000: rename u8PtkKeylen " Chaehyun Lim
` (28 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8Ptk to ptk to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 082450f..d225dbf 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3207,7 +3207,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
return result;
}
-int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
+int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 u8PtkKeylen, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx)
@@ -3240,7 +3240,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
msg.body.key_info.action = ADDKEY;
msg.body.key_info.attr.wpa.key = kmalloc(u8PtkKeylen, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, pu8Ptk, u8PtkKeylen);
+ memcpy(msg.body.key_info.attr.wpa.key, ptk, u8PtkKeylen);
if (pu8RxMic) {
memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 12deff4..ae70dc5 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -311,7 +311,7 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,
int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
const u8 *key, u8 len, u8 index, u8 mode,
enum AUTHTYPE auth_type);
-int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
+int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 u8PtkKeylen, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 04/32] staging: wilc1000: rename u8PtkKeylen in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
2015-11-08 7:48 ` [PATCH 02/32] staging: wilc1000: fix argument name " Chaehyun Lim
2015-11-08 7:48 ` [PATCH 03/32] staging: wilc1000: rename pu8Ptk in host_int_add_ptk Chaehyun Lim
@ 2015-11-08 7:48 ` Chaehyun Lim
2015-11-08 7:48 ` [PATCH 05/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
` (27 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8PtkKeylen to ptk_key_len to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d225dbf..96a0a58 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3208,13 +3208,13 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
}
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
- u8 u8PtkKeylen, const u8 *mac_addr,
+ u8 ptk_key_len, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx)
{
int result = 0;
struct host_if_msg msg;
- u8 u8KeyLen = u8PtkKeylen;
+ u8 u8KeyLen = ptk_key_len;
u32 i;
if (!hif_drv) {
@@ -3239,8 +3239,8 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
- msg.body.key_info.attr.wpa.key = kmalloc(u8PtkKeylen, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, ptk, u8PtkKeylen);
+ msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL);
+ memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len);
if (pu8RxMic) {
memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ae70dc5..ae0e260 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -312,7 +312,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
const u8 *key, u8 len, u8 index, u8 mode,
enum AUTHTYPE auth_type);
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
- u8 u8PtkKeylen, const u8 *mac_addr,
+ u8 ptk_key_len, const u8 *mac_addr,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 05/32] staging: wilc1000: rename pu8RxMic in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (2 preceding siblings ...)
2015-11-08 7:48 ` [PATCH 04/32] staging: wilc1000: rename u8PtkKeylen " Chaehyun Lim
@ 2015-11-08 7:48 ` Chaehyun Lim
2015-11-08 7:48 ` [PATCH 06/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
` (26 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8RxMic to rx_mic to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 10 +++++-----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 96a0a58..9616a61 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3209,7 +3209,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
- const u8 *pu8RxMic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx)
{
int result = 0;
@@ -3222,7 +3222,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
return -EFAULT;
}
- if (pu8RxMic)
+ if (rx_mic)
u8KeyLen += RX_MIC_KEY_LEN;
if (pu8TxMic)
@@ -3242,11 +3242,11 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL);
memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len);
- if (pu8RxMic) {
- memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);
+ if (rx_mic) {
+ memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < RX_MIC_KEY_LEN; i++)
- PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, pu8RxMic[i]);
+ PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);
}
}
if (pu8TxMic) {
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ae0e260..2ee9304 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -313,7 +313,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
enum AUTHTYPE auth_type);
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
- const u8 *pu8RxMic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 06/32] staging: wilc1000: rename pu8TxMic in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (3 preceding siblings ...)
2015-11-08 7:48 ` [PATCH 05/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
@ 2015-11-08 7:48 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 07/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
` (25 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8TxMic to tx_mic to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 10 +++++-----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 9616a61..a8566ee 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3209,7 +3209,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
- const u8 *rx_mic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *tx_mic,
u8 mode, u8 u8Ciphermode, u8 u8Idx)
{
int result = 0;
@@ -3225,7 +3225,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
if (rx_mic)
u8KeyLen += RX_MIC_KEY_LEN;
- if (pu8TxMic)
+ if (tx_mic)
u8KeyLen += TX_MIC_KEY_LEN;
memset(&msg, 0, sizeof(struct host_if_msg));
@@ -3249,11 +3249,11 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);
}
}
- if (pu8TxMic) {
- memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic, TX_MIC_KEY_LEN);
+ if (tx_mic) {
+ memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic, TX_MIC_KEY_LEN);
if (INFO) {
for (i = 0; i < TX_MIC_KEY_LEN; i++)
- PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, pu8TxMic[i]);
+ PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, tx_mic[i]);
}
}
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 2ee9304..5da584b 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -313,7 +313,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
enum AUTHTYPE auth_type);
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
- const u8 *rx_mic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *tx_mic,
u8 mode, u8 u8Ciphermode, u8 u8Idx);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 07/32] staging: wilc1000: rename u8Ciphermode in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (4 preceding siblings ...)
2015-11-08 7:48 ` [PATCH 06/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 08/32] staging: wilc1000: rename u8Idx " Chaehyun Lim
` (24 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8Ciphermode to cipher_mode to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a8566ee..80a1442 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3210,7 +3210,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 u8Ciphermode, u8 u8Idx)
+ u8 mode, u8 cipher_mode, u8 u8Idx)
{
int result = 0;
struct host_if_msg msg;
@@ -3259,7 +3259,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
msg.body.key_info.attr.wpa.key_len = u8KeyLen;
msg.body.key_info.attr.wpa.mac_addr = mac_addr;
- msg.body.key_info.attr.wpa.mode = u8Ciphermode;
+ msg.body.key_info.attr.wpa.mode = cipher_mode;
msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5da584b..04ecf50 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -314,7 +314,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 u8Ciphermode, u8 u8Idx);
+ u8 mode, u8 cipher_mode, u8 u8Idx);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 08/32] staging: wilc1000: rename u8Idx in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (5 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 07/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 09/32] staging: wilc1000: replace u32 with int Chaehyun Lim
` (23 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8Idx to index to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 80a1442..fedd099 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3210,7 +3210,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 cipher_mode, u8 u8Idx)
+ u8 mode, u8 cipher_mode, u8 index)
{
int result = 0;
struct host_if_msg msg;
@@ -3234,7 +3234,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
msg.body.key_info.type = WPA_PTK;
if (mode == AP_MODE) {
msg.body.key_info.action = ADDKEY_AP;
- msg.body.key_info.attr.wpa.index = u8Idx;
+ msg.body.key_info.attr.wpa.index = index;
}
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 04ecf50..9238315 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -314,7 +314,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 cipher_mode, u8 u8Idx);
+ u8 mode, u8 cipher_mode, u8 index);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 09/32] staging: wilc1000: replace u32 with int
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (6 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 08/32] staging: wilc1000: rename u8Idx " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 10/32] staging: wilc1000: rename u8KeyLen in host_int_add_ptk Chaehyun Lim
` (22 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
The data type of variable i changes u32 to int.
It is used as array index to print debug message so that it is better to
use data type of int.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index fedd099..a959f48 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3215,7 +3215,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
int result = 0;
struct host_if_msg msg;
u8 u8KeyLen = ptk_key_len;
- u32 i;
+ int i;
if (!hif_drv) {
PRINT_ER("driver is null\n");
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 10/32] staging: wilc1000: rename u8KeyLen in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (7 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 09/32] staging: wilc1000: replace u32 with int Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 11/32] staging: wilc1000: use kmemdup " Chaehyun Lim
` (21 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8KeyLen to key_len to avoid camelcase.
It is used as local variable in order to save pkt_key_len that is
argument of this function.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a959f48..dd7e8ed 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3214,7 +3214,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
{
int result = 0;
struct host_if_msg msg;
- u8 u8KeyLen = ptk_key_len;
+ u8 key_len = ptk_key_len;
int i;
if (!hif_drv) {
@@ -3223,10 +3223,10 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
}
if (rx_mic)
- u8KeyLen += RX_MIC_KEY_LEN;
+ key_len += RX_MIC_KEY_LEN;
if (tx_mic)
- u8KeyLen += TX_MIC_KEY_LEN;
+ key_len += TX_MIC_KEY_LEN;
memset(&msg, 0, sizeof(struct host_if_msg));
@@ -3257,7 +3257,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
}
}
- msg.body.key_info.attr.wpa.key_len = u8KeyLen;
+ msg.body.key_info.attr.wpa.key_len = key_len;
msg.body.key_info.attr.wpa.mac_addr = mac_addr;
msg.body.key_info.attr.wpa.mode = cipher_mode;
msg.drv = hif_drv;
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 11/32] staging: wilc1000: use kmemdup in host_int_add_ptk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (8 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 10/32] staging: wilc1000: rename u8KeyLen in host_int_add_ptk Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 12/32] staging: wilc1000: fix return type of host_int_add_rx_gtk Chaehyun Lim
` (20 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes kmalloc followed by memcpy to kmemdup
The error checking is also added when kmemdup is failed.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index dd7e8ed..18623c7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3239,8 +3239,9 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
- msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len);
+ msg.body.key_info.attr.wpa.key = kmemdup(ptk, ptk_key_len, GFP_KERNEL);
+ if (!msg.body.key_info.attr.wpa.key)
+ return -ENOMEM;
if (rx_mic) {
memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 12/32] staging: wilc1000: fix return type of host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (9 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 11/32] staging: wilc1000: use kmemdup " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 13/32] staging: wilc1000: fix argument name " Chaehyun Lim
` (19 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes return type of host_int_add_rx_gtk from s32 to int.
The result variable gets return value from wilc_mq_send that has return
type of int. It should be changed return type of this function as well
as data type of result variable.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 18623c7..12b3f1d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3273,13 +3273,13 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
return result;
}
-s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
u8 u8GtkKeylen, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
{
- s32 result = 0;
+ int result = 0;
struct host_if_msg msg;
u8 u8KeyLen = u8GtkKeylen;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 9238315..2f10598 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -317,7 +317,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 mode, u8 cipher_mode, u8 index);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
-s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
u8 u8GtkKeylen, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 13/32] staging: wilc1000: fix argument name of host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (10 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 12/32] staging: wilc1000: fix return type of host_int_add_rx_gtk Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 14/32] staging: wilc1000: rename pu8RxGtk in host_int_add_rx_gtk Chaehyun Lim
` (18 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes struct host_if_drv of host_int_add_rx_gtk function
declaration from hWFIDrv to hif_drv.
With this change, first argument of this function declaration and
definition has same name as hif_drv.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 2f10598..5f1b20c 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -317,7 +317,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 mode, u8 cipher_mode, u8 index);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
-int host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
u8 u8GtkKeylen, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 14/32] staging: wilc1000: rename pu8RxGtk in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (11 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 13/32] staging: wilc1000: fix argument name " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 15/32] staging: wilc1000: rename u8GtkKeylen " Chaehyun Lim
` (17 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8RxGtk to rx_gtk to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 12b3f1d..b79383e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3273,7 +3273,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
return result;
}
-int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 u8GtkKeylen, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
@@ -3312,7 +3312,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
msg.body.key_info.action = ADDKEY;
msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, pu8RxGtk, u8GtkKeylen);
+ memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, u8GtkKeylen);
if (pu8RxMic)
memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic,
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5f1b20c..51f51be 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -317,7 +317,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 mode, u8 cipher_mode, u8 index);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
-int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 u8GtkKeylen, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 15/32] staging: wilc1000: rename u8GtkKeylen in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (12 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 14/32] staging: wilc1000: rename pu8RxGtk in host_int_add_rx_gtk Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 16/32] staging: wilc1000: rename u8KeyIdx " Chaehyun Lim
` (16 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8GtkKeylen to gtk_key_len to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b79383e..5c40d40 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3274,14 +3274,14 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
}
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
- u8 u8GtkKeylen, u8 u8KeyIdx,
+ u8 gtk_key_len, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
{
int result = 0;
struct host_if_msg msg;
- u8 u8KeyLen = u8GtkKeylen;
+ u8 u8KeyLen = gtk_key_len;
if (!hif_drv) {
PRINT_ER("driver is null\n");
@@ -3312,7 +3312,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
msg.body.key_info.action = ADDKEY;
msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, u8GtkKeylen);
+ memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
if (pu8RxMic)
memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic,
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 51f51be..6b7b05e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -318,7 +318,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
- u8 u8GtkKeylen, u8 u8KeyIdx,
+ u8 gtk_key_len, u8 u8KeyIdx,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 16/32] staging: wilc1000: rename u8KeyIdx in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (13 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 15/32] staging: wilc1000: rename u8GtkKeylen " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 17/32] staging: wilc1000: rename u32KeyRSClen " Chaehyun Lim
` (15 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8KeyIdx to index to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 5c40d40..22fdca5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3274,7 +3274,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
}
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
- u8 gtk_key_len, u8 u8KeyIdx,
+ u8 gtk_key_len, u8 index,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
@@ -3322,7 +3322,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,
TX_MIC_KEY_LEN);
- msg.body.key_info.attr.wpa.index = u8KeyIdx;
+ msg.body.key_info.attr.wpa.index = index;
msg.body.key_info.attr.wpa.key_len = u8KeyLen;
msg.body.key_info.attr.wpa.seq_len = u32KeyRSClen;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 6b7b05e..41ca349 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -318,7 +318,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
- u8 gtk_key_len, u8 u8KeyIdx,
+ u8 gtk_key_len, u8 index,
u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 17/32] staging: wilc1000: rename u32KeyRSClen in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (14 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 16/32] staging: wilc1000: rename u8KeyIdx " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 18/32] staging: wilc1000: rename KeyRSC " Chaehyun Lim
` (14 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u32KeyRSClen to key_rsc_len to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 22fdca5..32d4606 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3275,7 +3275,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
- u32 u32KeyRSClen, const u8 *KeyRSC,
+ u32 key_rsc_len, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
{
@@ -3296,8 +3296,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8KeyLen += TX_MIC_KEY_LEN;
if (KeyRSC) {
- msg.body.key_info.attr.wpa.seq = kmalloc(u32KeyRSClen, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, u32KeyRSClen);
+ msg.body.key_info.attr.wpa.seq = kmalloc(key_rsc_len, GFP_KERNEL);
+ memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, key_rsc_len);
}
msg.id = HOST_IF_MSG_KEY;
@@ -3324,7 +3324,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
msg.body.key_info.attr.wpa.index = index;
msg.body.key_info.attr.wpa.key_len = u8KeyLen;
- msg.body.key_info.attr.wpa.seq_len = u32KeyRSClen;
+ msg.body.key_info.attr.wpa.seq_len = key_rsc_len;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 41ca349..f75bfa1 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -319,7 +319,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
- u32 u32KeyRSClen, const u8 *KeyRSC,
+ u32 key_rsc_len, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode);
s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 18/32] staging: wilc1000: rename KeyRSC in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (15 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 17/32] staging: wilc1000: rename u32KeyRSClen " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 19/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
` (13 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes KeyRSC to key_rsc to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 32d4606..b50e78d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3275,7 +3275,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
- u32 key_rsc_len, const u8 *KeyRSC,
+ u32 key_rsc_len, const u8 *key_rsc,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
{
@@ -3295,9 +3295,9 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
if (pu8TxMic)
u8KeyLen += TX_MIC_KEY_LEN;
- if (KeyRSC) {
+ if (key_rsc) {
msg.body.key_info.attr.wpa.seq = kmalloc(key_rsc_len, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, key_rsc_len);
+ memcpy(msg.body.key_info.attr.wpa.seq, key_rsc, key_rsc_len);
}
msg.id = HOST_IF_MSG_KEY;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index f75bfa1..66bb7d7 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -319,7 +319,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime);
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
- u32 key_rsc_len, const u8 *KeyRSC,
+ u32 key_rsc_len, const u8 *key_rsc,
const u8 *pu8RxMic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode);
s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 19/32] staging: wilc1000: rename pu8RxMic in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (16 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 18/32] staging: wilc1000: rename KeyRSC " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 20/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
` (12 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8RxMic to rx_mic to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b50e78d..df364dc 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3276,7 +3276,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
- const u8 *pu8RxMic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode)
{
int result = 0;
@@ -3289,7 +3289,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
}
memset(&msg, 0, sizeof(struct host_if_msg));
- if (pu8RxMic)
+ if (rx_mic)
u8KeyLen += RX_MIC_KEY_LEN;
if (pu8TxMic)
@@ -3314,8 +3314,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
- if (pu8RxMic)
- memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic,
+ if (rx_mic)
+ memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,
RX_MIC_KEY_LEN);
if (pu8TxMic)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 66bb7d7..42c8749 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -320,7 +320,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
- const u8 *pu8RxMic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *pu8TxMic,
u8 mode, u8 u8Ciphermode);
s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
u8 *pu8TxGtk, u8 u8KeyIdx);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 20/32] staging: wilc1000: rename pu8TxMic in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (17 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 19/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 21/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
` (11 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes pu8TxMic to tx_mic to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index df364dc..7ca924a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3276,7 +3276,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
- const u8 *rx_mic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *tx_mic,
u8 mode, u8 u8Ciphermode)
{
int result = 0;
@@ -3292,7 +3292,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
if (rx_mic)
u8KeyLen += RX_MIC_KEY_LEN;
- if (pu8TxMic)
+ if (tx_mic)
u8KeyLen += TX_MIC_KEY_LEN;
if (key_rsc) {
@@ -3318,8 +3318,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,
RX_MIC_KEY_LEN);
- if (pu8TxMic)
- memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,
+ if (tx_mic)
+ memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic,
TX_MIC_KEY_LEN);
msg.body.key_info.attr.wpa.index = index;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 42c8749..e25f838 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -320,7 +320,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
- const u8 *rx_mic, const u8 *pu8TxMic,
+ const u8 *rx_mic, const u8 *tx_mic,
u8 mode, u8 u8Ciphermode);
s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
u8 *pu8TxGtk, u8 u8KeyIdx);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 21/32] staging: wilc1000: rename u8Ciphermode in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (18 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 20/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 22/32] staging: wilc1000: rename u8KeyLen " Chaehyun Lim
` (10 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8Ciphermode to cipher_mode to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7ca924a..7b647ce 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3277,7 +3277,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 u8Ciphermode)
+ u8 mode, u8 cipher_mode)
{
int result = 0;
struct host_if_msg msg;
@@ -3306,7 +3306,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
if (mode == AP_MODE) {
msg.body.key_info.action = ADDKEY_AP;
- msg.body.key_info.attr.wpa.mode = u8Ciphermode;
+ msg.body.key_info.attr.wpa.mode = cipher_mode;
}
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index e25f838..da81b92 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -321,7 +321,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 gtk_key_len, u8 index,
u32 key_rsc_len, const u8 *key_rsc,
const u8 *rx_mic, const u8 *tx_mic,
- u8 mode, u8 u8Ciphermode);
+ u8 mode, u8 cipher_mode);
s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
u8 *pu8TxGtk, u8 u8KeyIdx);
s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 22/32] staging: wilc1000: rename u8KeyLen in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (19 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 21/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 23/32] staging: wilc1000: use kmemdup " Chaehyun Lim
` (9 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes u8KeyLen to key_len to avoid camelcase.
It is used as local variable in order to save gtk_key_len that is
argument of this function.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7b647ce..0028bed 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3281,7 +3281,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
{
int result = 0;
struct host_if_msg msg;
- u8 u8KeyLen = gtk_key_len;
+ u8 key_len = gtk_key_len;
if (!hif_drv) {
PRINT_ER("driver is null\n");
@@ -3290,10 +3290,10 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
memset(&msg, 0, sizeof(struct host_if_msg));
if (rx_mic)
- u8KeyLen += RX_MIC_KEY_LEN;
+ key_len += RX_MIC_KEY_LEN;
if (tx_mic)
- u8KeyLen += TX_MIC_KEY_LEN;
+ key_len += TX_MIC_KEY_LEN;
if (key_rsc) {
msg.body.key_info.attr.wpa.seq = kmalloc(key_rsc_len, GFP_KERNEL);
@@ -3311,7 +3311,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
- msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
+ msg.body.key_info.attr.wpa.key = kmalloc(key_len, GFP_KERNEL);
memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
if (rx_mic)
@@ -3323,7 +3323,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
TX_MIC_KEY_LEN);
msg.body.key_info.attr.wpa.index = index;
- msg.body.key_info.attr.wpa.key_len = u8KeyLen;
+ msg.body.key_info.attr.wpa.key_len = key_len;
msg.body.key_info.attr.wpa.seq_len = key_rsc_len;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 23/32] staging: wilc1000: use kmemdup in host_int_add_rx_gtk
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (20 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 22/32] staging: wilc1000: rename u8KeyLen " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 24/32] staging: wilc1000: remove host_int_add_tx_gtk declaration Chaehyun Lim
` (8 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch changes kmalloc followed by memcpy to kmemdup.
The error checking is also added when kmemdup is failed.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0028bed..51b6ddb 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3296,8 +3296,11 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
key_len += TX_MIC_KEY_LEN;
if (key_rsc) {
- msg.body.key_info.attr.wpa.seq = kmalloc(key_rsc_len, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.seq, key_rsc, key_rsc_len);
+ msg.body.key_info.attr.wpa.seq = kmemdup(key_rsc,
+ key_rsc_len,
+ GFP_KERNEL);
+ if (!msg.body.key_info.attr.wpa.seq)
+ return -ENOMEM;
}
msg.id = HOST_IF_MSG_KEY;
@@ -3311,8 +3314,11 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
if (mode == STATION_MODE)
msg.body.key_info.action = ADDKEY;
- msg.body.key_info.attr.wpa.key = kmalloc(key_len, GFP_KERNEL);
- memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
+ msg.body.key_info.attr.wpa.key = kmemdup(rx_gtk,
+ key_len,
+ GFP_KERNEL);
+ if (!msg.body.key_info.attr.wpa.key)
+ return -ENOMEM;
if (rx_mic)
memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 24/32] staging: wilc1000: remove host_int_add_tx_gtk declaration
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (21 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 23/32] staging: wilc1000: use kmemdup " Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 25/32] staging: wilc1000: remove host_int_get_pmkid_info Chaehyun Lim
` (7 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_add_tx_gtk declaration that is defined in
host_interface.h file. It can not find any host_int_add_tx_gtk
function definition in this driver so just remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index da81b92..91fbfa6 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -322,8 +322,6 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u32 key_rsc_len, const u8 *key_rsc,
const u8 *rx_mic, const u8 *tx_mic,
u8 mode, u8 cipher_mode);
-s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
- u8 *pu8TxGtk, u8 u8KeyIdx);
s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
struct host_if_pmkid_attr *pu8PmkidInfoArray);
s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 25/32] staging: wilc1000: remove host_int_get_pmkid_info
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (22 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 24/32] staging: wilc1000: remove host_int_add_tx_gtk declaration Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 26/32] staging: wilc1000: remove host_int_set_RSNAConfigPSKPassPhrase Chaehyun Lim
` (6 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_get_pmkid_info function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere in this driver so just
remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 14 --------------
drivers/staging/wilc1000/host_interface.h | 2 --
2 files changed, 16 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 51b6ddb..6015582 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3373,20 +3373,6 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hif_drv, struct host_if_pmkid_at
return result;
}
-s32 host_int_get_pmkid_info(struct host_if_drv *hif_drv,
- u8 *pu8PmkidInfoArray,
- u32 u32PmkidInfoLen)
-{
- struct wid wid;
-
- wid.id = (u16)WID_PMKID_INFO;
- wid.type = WID_STR;
- wid.size = u32PmkidInfoLen;
- wid.val = pu8PmkidInfoArray;
-
- return 0;
-}
-
s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hif_drv,
u8 *pu8PassPhrase,
u8 u8Psklength)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 91fbfa6..dd5a14a 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -324,8 +324,6 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 mode, u8 cipher_mode);
s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
struct host_if_pmkid_attr *pu8PmkidInfoArray);
-s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
- u32 u32PmkidInfoLen);
s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
u8 *pu8PassPhrase,
u8 u8Psklength);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 26/32] staging: wilc1000: remove host_int_set_RSNAConfigPSKPassPhrase
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (23 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 25/32] staging: wilc1000: remove host_int_get_pmkid_info Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 27/32] staging: wilc1000: remove host_int_get_RSNAConfigPSKPassPhrase Chaehyun Lim
` (5 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_set_RSNAConfigPSKPassPhrase function
definition and declaration that is defined at host_interface.c and
host_interface.h. This function is defined but not used anywhere in this
driver so just remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 16 ----------------
drivers/staging/wilc1000/host_interface.h | 3 ---
2 files changed, 19 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6015582..fb6f353 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3373,22 +3373,6 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hif_drv, struct host_if_pmkid_at
return result;
}
-s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hif_drv,
- u8 *pu8PassPhrase,
- u8 u8Psklength)
-{
- struct wid wid;
-
- if ((u8Psklength > 7) && (u8Psklength < 65)) {
- wid.id = (u16)WID_11I_PSK;
- wid.type = WID_STR;
- wid.val = pu8PassPhrase;
- wid.size = u8Psklength;
- }
-
- return 0;
-}
-
s32 hif_get_mac_address(struct host_if_drv *hif_drv, u8 *pu8MacAddress)
{
s32 result = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index dd5a14a..8113d76 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -324,9 +324,6 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 mode, u8 cipher_mode);
s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
struct host_if_pmkid_attr *pu8PmkidInfoArray);
-s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
- u8 *pu8PassPhrase,
- u8 u8Psklength);
s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
u8 *pu8PassPhrase, u8 u8Psklength);
s32 hif_get_mac_address(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 27/32] staging: wilc1000: remove host_int_get_RSNAConfigPSKPassPhrase
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (24 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 26/32] staging: wilc1000: remove host_int_set_RSNAConfigPSKPassPhrase Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 28/32] staging: wilc1000: remove host_int_set_start_scan_req Chaehyun Lim
` (4 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_get_RSNAConfigPSKPassPhrase function
definition and declaration that is defined at host_interface.c and
host_interface.h. This function is defined but not used anywhere in this
driver so just remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 13 -------------
drivers/staging/wilc1000/host_interface.h | 2 --
2 files changed, 15 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index fb6f353..f7bbad0 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3413,19 +3413,6 @@ s32 host_int_set_MacAddress(struct host_if_drv *hif_drv, u8 *pu8MacAddress)
return result;
}
-s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hif_drv,
- u8 *pu8PassPhrase, u8 u8Psklength)
-{
- struct wid wid;
-
- wid.id = (u16)WID_11I_PSK;
- wid.type = WID_STR;
- wid.size = u8Psklength;
- wid.val = pu8PassPhrase;
-
- return 0;
-}
-
s32 host_int_set_start_scan_req(struct host_if_drv *hif_drv, u8 scanSource)
{
struct wid wid;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8113d76..976067a 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -324,8 +324,6 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
u8 mode, u8 cipher_mode);
s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
struct host_if_pmkid_attr *pu8PmkidInfoArray);
-s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
- u8 *pu8PassPhrase, u8 u8Psklength);
s32 hif_get_mac_address(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
int host_int_wait_msg_queue_idle(void);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 28/32] staging: wilc1000: remove host_int_set_start_scan_req
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (25 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 27/32] staging: wilc1000: remove host_int_get_RSNAConfigPSKPassPhrase Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 29/32] staging: wilc1000: remove host_int_get_start_scan_req Chaehyun Lim
` (3 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_set_start_scan_req function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere in this driver so that
just remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 12 ------------
drivers/staging/wilc1000/host_interface.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index f7bbad0..174cb6a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3413,18 +3413,6 @@ s32 host_int_set_MacAddress(struct host_if_drv *hif_drv, u8 *pu8MacAddress)
return result;
}
-s32 host_int_set_start_scan_req(struct host_if_drv *hif_drv, u8 scanSource)
-{
- struct wid wid;
-
- wid.id = (u16)WID_START_SCAN_REQ;
- wid.type = WID_CHAR;
- wid.val = (s8 *)&scanSource;
- wid.size = sizeof(char);
-
- return 0;
-}
-
s32 host_int_get_start_scan_req(struct host_if_drv *hif_drv, u8 *pu8ScanSource)
{
struct wid wid;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 976067a..14ce397 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -327,7 +327,6 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
s32 hif_get_mac_address(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
int host_int_wait_msg_queue_idle(void);
-s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource);
s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource);
s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 29/32] staging: wilc1000: remove host_int_get_start_scan_req
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (26 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 28/32] staging: wilc1000: remove host_int_set_start_scan_req Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 30/32] staging: wilc1000: remove host_int_disconnect_station Chaehyun Lim
` (2 subsequent siblings)
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_get_start_scan_req function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere in this driver so just
remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 12 ------------
drivers/staging/wilc1000/host_interface.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 174cb6a..0575345 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3413,18 +3413,6 @@ s32 host_int_set_MacAddress(struct host_if_drv *hif_drv, u8 *pu8MacAddress)
return result;
}
-s32 host_int_get_start_scan_req(struct host_if_drv *hif_drv, u8 *pu8ScanSource)
-{
- struct wid wid;
-
- wid.id = (u16)WID_START_SCAN_REQ;
- wid.type = WID_CHAR;
- wid.val = (s8 *)pu8ScanSource;
- wid.size = sizeof(char);
-
- return 0;
-}
-
s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen,
const u8 *pu8IEs, size_t IEsLen,
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 14ce397..52622df 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -327,7 +327,6 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,
s32 hif_get_mac_address(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
int host_int_wait_msg_queue_idle(void);
-s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource);
s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen,
const u8 *pu8IEs, size_t IEsLen,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 30/32] staging: wilc1000: remove host_int_disconnect_station
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (27 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 29/32] staging: wilc1000: remove host_int_get_start_scan_req Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 31/32] staging: wilc1000: remove host_int_get_assoc_req_info Chaehyun Lim
2015-11-08 7:49 ` [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level Chaehyun Lim
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_disconnect_station function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere so just remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 12 ------------
drivers/staging/wilc1000/host_interface.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0575345..676b3c7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3529,18 +3529,6 @@ s32 host_int_disconnect(struct host_if_drv *hif_drv, u16 u16ReasonCode)
return result;
}
-s32 host_int_disconnect_station(struct host_if_drv *hif_drv, u8 assoc_id)
-{
- struct wid wid;
-
- wid.id = (u16)WID_DISCONNECT;
- wid.type = WID_CHAR;
- wid.val = (s8 *)&assoc_id;
- wid.size = sizeof(char);
-
- return 0;
-}
-
s32 host_int_get_assoc_req_info(struct host_if_drv *hif_drv,
u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen)
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 52622df..e51a563 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -335,7 +335,6 @@ s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
u8 u8channel, void *pJoinParams);
s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);
s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode);
-s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id);
s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv,
u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 31/32] staging: wilc1000: remove host_int_get_assoc_req_info
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (28 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 30/32] staging: wilc1000: remove host_int_disconnect_station Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-08 7:49 ` [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level Chaehyun Lim
30 siblings, 0 replies; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_get_assoc_req_info function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere in this driver so just
remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 14 --------------
drivers/staging/wilc1000/host_interface.h | 3 ---
2 files changed, 17 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 676b3c7..ff15179 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3529,20 +3529,6 @@ s32 host_int_disconnect(struct host_if_drv *hif_drv, u16 u16ReasonCode)
return result;
}
-s32 host_int_get_assoc_req_info(struct host_if_drv *hif_drv,
- u8 *pu8AssocReqInfo,
- u32 u32AssocReqInfoLen)
-{
- struct wid wid;
-
- wid.id = (u16)WID_ASSOC_REQ_INFO;
- wid.type = WID_STR;
- wid.val = pu8AssocReqInfo;
- wid.size = u32AssocReqInfoLen;
-
- return 0;
-}
-
s32 host_int_get_assoc_res_info(struct host_if_drv *hif_drv,
u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen,
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index e51a563..8870458 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -335,9 +335,6 @@ s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
u8 u8channel, void *pJoinParams);
s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);
s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode);
-s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv,
- u8 *pu8AssocReqInfo,
- u32 u32AssocReqInfoLen);
s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv,
u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen,
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
` (29 preceding siblings ...)
2015-11-08 7:49 ` [PATCH 31/32] staging: wilc1000: remove host_int_get_assoc_req_info Chaehyun Lim
@ 2015-11-08 7:49 ` Chaehyun Lim
2015-11-10 0:41 ` Shin, Austin
30 siblings, 1 reply; 33+ messages in thread
From: Chaehyun Lim @ 2015-11-08 7:49 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes host_int_get_rx_power_level function definition and
declaration that is defined at host_interface.c and host_interface.h.
This function is defined but not used anywhere in this driver so just
remove it.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 14 --------------
drivers/staging/wilc1000/host_interface.h | 3 ---
2 files changed, 17 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index ff15179..5bf9a55 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3560,20 +3560,6 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hif_drv,
return result;
}
-s32 host_int_get_rx_power_level(struct host_if_drv *hif_drv,
- u8 *pu8RxPowerLevel,
- u32 u32RxPowerLevelLen)
-{
- struct wid wid;
-
- wid.id = (u16)WID_RX_POWER_LEVEL;
- wid.type = WID_STR;
- wid.val = pu8RxPowerLevel;
- wid.size = u32RxPowerLevelLen;
-
- return 0;
-}
-
int host_int_set_mac_chnl_num(struct host_if_drv *hif_drv, u8 channel)
{
int result;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8870458..c01f441 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -339,9 +339,6 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv,
u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen,
u32 *pu32RcvdAssocRespInfoLen);
-s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv,
- u8 *pu8RxPowerLevel,
- u32 u32RxPowerLevelLen);
int host_int_set_mac_chnl_num(struct host_if_drv *wfi_drv, u8 channel);
s32 host_int_get_host_chnl_num(struct host_if_drv *hWFIDrv, u8 *pu8ChNo);
s32 host_int_get_rssi(struct host_if_drv *hWFIDrv, s8 *ps8Rssi);
--
2.6.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level
2015-11-08 7:49 ` [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level Chaehyun Lim
@ 2015-11-10 0:41 ` Shin, Austin
0 siblings, 0 replies; 33+ messages in thread
From: Shin, Austin @ 2015-11-10 0:41 UTC (permalink / raw)
To: Chaehyun Lim, gregkh
Cc: Kim, Johnny, Park, Chris, Cho, Tony, Lee, Glen, Kim, Leo,
linux-wireless, devel
SEkgQWxsLAppZiB5b3Ugd2FudCwgSSB3b3VsZCBzaGlwIHRoZSBib2FyZCBmb3IgeW91IHRvIHZl
cmlmeS4gQW55Ym9keSB3ZWxjb21lLgoKCk9uIDIwMTWz4iAxMb/5IDjAzyC/wMD8IDg6NTE6MTIg
Q2hhZWh5dW4gTGltIDxjaGFlaHl1bi5saW1AZ21haWwuY29tPiB3cm90ZToKCj4gVGhpcyBwYXRj
aCByZW1vdmVzIGhvc3RfaW50X2dldF9yeF9wb3dlcl9sZXZlbCBmdW5jdGlvbiBkZWZpbml0aW9u
IGFuZAo+IGRlY2xhcmF0aW9uIHRoYXQgaXMgZGVmaW5lZCBhdCBob3N0X2ludGVyZmFjZS5jIGFu
ZCBob3N0X2ludGVyZmFjZS5oLgo+IFRoaXMgZnVuY3Rpb24gaXMgZGVmaW5lZCBidXQgbm90IHVz
ZWQgYW55d2hlcmUgaW4gdGhpcyBkcml2ZXIgc28ganVzdAo+IHJlbW92ZSBpdC4KPgo+IFNpZ25l
ZC1vZmYtYnk6IENoYWVoeXVuIExpbSA8Y2hhZWh5dW4ubGltQGdtYWlsLmNvbT4KPiAtLS0KPiAg
ZHJpdmVycy9zdGFnaW5nL3dpbGMxMDAwL2hvc3RfaW50ZXJmYWNlLmMgfCAxNCAtLS0tLS0tLS0t
LS0tLQo+ICBkcml2ZXJzL3N0YWdpbmcvd2lsYzEwMDAvaG9zdF9pbnRlcmZhY2UuaCB8ICAzIC0t
LQo+ICAyIGZpbGVzIGNoYW5nZWQsIDE3IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvc3RhZ2luZy93aWxjMTAwMC9ob3N0X2ludGVyZmFjZS5jIGIvZHJpdmVycy9zdGFnaW5n
L3dpbGMxMDAwL2hvc3RfaW50ZXJmYWNlLmMKPiBpbmRleCBmZjE1MTc5Li41YmY5YTU1IDEwMDY0
NAo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy93aWxjMTAwMC9ob3N0X2ludGVyZmFjZS5jCj4gKysr
IGIvZHJpdmVycy9zdGFnaW5nL3dpbGMxMDAwL2hvc3RfaW50ZXJmYWNlLmMKPiBAQCAtMzU2MCwy
MCArMzU2MCw2IEBAIHMzMiBob3N0X2ludF9nZXRfYXNzb2NfcmVzX2luZm8oc3RydWN0IGhvc3Rf
aWZfZHJ2ICpoaWZfZHJ2LAo+ICAJcmV0dXJuIHJlc3VsdDsKPiAgfQo+ICAKPiAtczMyIGhvc3Rf
aW50X2dldF9yeF9wb3dlcl9sZXZlbChzdHJ1Y3QgaG9zdF9pZl9kcnYgKmhpZl9kcnYsCj4gLQkJ
CQl1OCAqcHU4UnhQb3dlckxldmVsLAo+IC0JCQkJdTMyIHUzMlJ4UG93ZXJMZXZlbExlbikKPiAt
ewo+IC0Jc3RydWN0IHdpZCB3aWQ7Cj4gLQo+IC0Jd2lkLmlkID0gKHUxNilXSURfUlhfUE9XRVJf
TEVWRUw7Cj4gLQl3aWQudHlwZSA9IFdJRF9TVFI7Cj4gLQl3aWQudmFsID0gcHU4UnhQb3dlckxl
dmVsOwo+IC0Jd2lkLnNpemUgPSB1MzJSeFBvd2VyTGV2ZWxMZW47Cj4gLQo+IC0JcmV0dXJuIDA7
Cj4gLX0KPiAtCj4gIGludCBob3N0X2ludF9zZXRfbWFjX2NobmxfbnVtKHN0cnVjdCBob3N0X2lm
X2RydiAqaGlmX2RydiwgdTggY2hhbm5lbCkKPiAgewo+ICAJaW50IHJlc3VsdDsKPiBkaWZmIC0t
Z2l0IGEvZHJpdmVycy9zdGFnaW5nL3dpbGMxMDAwL2hvc3RfaW50ZXJmYWNlLmggYi9kcml2ZXJz
L3N0YWdpbmcvd2lsYzEwMDAvaG9zdF9pbnRlcmZhY2UuaAo+IGluZGV4IDg4NzA0NTguLmMwMWY0
NDEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL3dpbGMxMDAwL2hvc3RfaW50ZXJmYWNl
LmgKPiArKysgYi9kcml2ZXJzL3N0YWdpbmcvd2lsYzEwMDAvaG9zdF9pbnRlcmZhY2UuaAo+IEBA
IC0zMzksOSArMzM5LDYgQEAgczMyIGhvc3RfaW50X2dldF9hc3NvY19yZXNfaW5mbyhzdHJ1Y3Qg
aG9zdF9pZl9kcnYgKmhXRklEcnYsCj4gIAkJCQl1OCAqcHU4QXNzb2NSZXNwSW5mbywKPiAgCQkJ
CXUzMiB1MzJNYXhBc3NvY1Jlc3BJbmZvTGVuLAo+ICAJCQkJdTMyICpwdTMyUmN2ZEFzc29jUmVz
cEluZm9MZW4pOwo+IC1zMzIgaG9zdF9pbnRfZ2V0X3J4X3Bvd2VyX2xldmVsKHN0cnVjdCBob3N0
X2lmX2RydiAqaFdGSURydiwKPiAtCQkJCXU4ICpwdThSeFBvd2VyTGV2ZWwsCj4gLQkJCQl1MzIg
dTMyUnhQb3dlckxldmVsTGVuKTsKPiAgaW50IGhvc3RfaW50X3NldF9tYWNfY2hubF9udW0oc3Ry
dWN0IGhvc3RfaWZfZHJ2ICp3ZmlfZHJ2LCB1OCBjaGFubmVsKTsKPiAgczMyIGhvc3RfaW50X2dl
dF9ob3N0X2NobmxfbnVtKHN0cnVjdCBob3N0X2lmX2RydiAqaFdGSURydiwgdTggKnB1OENoTm8p
Owo+ICBzMzIgaG9zdF9pbnRfZ2V0X3Jzc2koc3RydWN0IGhvc3RfaWZfZHJ2ICpoV0ZJRHJ2LCBz
OCAqcHM4UnNzaSk7Cj4gLS0gCj4gMi42LjMK
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2015-11-10 0:41 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-08 7:48 [PATCH 01/32] staging: wilc1000: fix return type of host_int_add_ptk Chaehyun Lim
2015-11-08 7:48 ` [PATCH 02/32] staging: wilc1000: fix argument name " Chaehyun Lim
2015-11-08 7:48 ` [PATCH 03/32] staging: wilc1000: rename pu8Ptk in host_int_add_ptk Chaehyun Lim
2015-11-08 7:48 ` [PATCH 04/32] staging: wilc1000: rename u8PtkKeylen " Chaehyun Lim
2015-11-08 7:48 ` [PATCH 05/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
2015-11-08 7:48 ` [PATCH 06/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 07/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 08/32] staging: wilc1000: rename u8Idx " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 09/32] staging: wilc1000: replace u32 with int Chaehyun Lim
2015-11-08 7:49 ` [PATCH 10/32] staging: wilc1000: rename u8KeyLen in host_int_add_ptk Chaehyun Lim
2015-11-08 7:49 ` [PATCH 11/32] staging: wilc1000: use kmemdup " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 12/32] staging: wilc1000: fix return type of host_int_add_rx_gtk Chaehyun Lim
2015-11-08 7:49 ` [PATCH 13/32] staging: wilc1000: fix argument name " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 14/32] staging: wilc1000: rename pu8RxGtk in host_int_add_rx_gtk Chaehyun Lim
2015-11-08 7:49 ` [PATCH 15/32] staging: wilc1000: rename u8GtkKeylen " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 16/32] staging: wilc1000: rename u8KeyIdx " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 17/32] staging: wilc1000: rename u32KeyRSClen " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 18/32] staging: wilc1000: rename KeyRSC " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 19/32] staging: wilc1000: rename pu8RxMic " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 20/32] staging: wilc1000: rename pu8TxMic " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 21/32] staging: wilc1000: rename u8Ciphermode " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 22/32] staging: wilc1000: rename u8KeyLen " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 23/32] staging: wilc1000: use kmemdup " Chaehyun Lim
2015-11-08 7:49 ` [PATCH 24/32] staging: wilc1000: remove host_int_add_tx_gtk declaration Chaehyun Lim
2015-11-08 7:49 ` [PATCH 25/32] staging: wilc1000: remove host_int_get_pmkid_info Chaehyun Lim
2015-11-08 7:49 ` [PATCH 26/32] staging: wilc1000: remove host_int_set_RSNAConfigPSKPassPhrase Chaehyun Lim
2015-11-08 7:49 ` [PATCH 27/32] staging: wilc1000: remove host_int_get_RSNAConfigPSKPassPhrase Chaehyun Lim
2015-11-08 7:49 ` [PATCH 28/32] staging: wilc1000: remove host_int_set_start_scan_req Chaehyun Lim
2015-11-08 7:49 ` [PATCH 29/32] staging: wilc1000: remove host_int_get_start_scan_req Chaehyun Lim
2015-11-08 7:49 ` [PATCH 30/32] staging: wilc1000: remove host_int_disconnect_station Chaehyun Lim
2015-11-08 7:49 ` [PATCH 31/32] staging: wilc1000: remove host_int_get_assoc_req_info Chaehyun Lim
2015-11-08 7:49 ` [PATCH 32/32] staging: wilc1000: remove host_int_get_rx_power_level Chaehyun Lim
2015-11-10 0:41 ` Shin, Austin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.