* [PATCH V2 1/8] staging: wilc1000: remove INLINE macro
@ 2015-09-17 7:48 Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 2/8] staging: wilc1000: replace __inline with inline Chaehyun Lim
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes INLINE macro that is used anymore.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/coreconfigurator.c | 1 -
drivers/staging/wilc1000/wilc_wlan.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 2fa2790..14e8efc 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -17,7 +17,6 @@
/*****************************************************************************/
/* Constants */
/*****************************************************************************/
-#define INLINE static __inline
#define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
BEACON_INTERVAL_LEN + CAP_INFO_LEN)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 4c25179..47fa0f3 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -9,7 +9,6 @@
#include "wilc_wlan_if.h"
#include "wilc_wlan.h"
-#define INLINE static __inline
/********************************************
*
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 2/8] staging: wilc1000: replace __inline with inline
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 3/8] staging: wilc1000: replace int8_t with int Chaehyun Lim
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch replaces __inline with inline. plain inline is more
preferred than __inline.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_wlan.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 47fa0f3..1fe1ba5 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -316,13 +316,13 @@ u32 Pending_Acks;
-static __inline int Init_TCP_tracking(void)
+static inline int Init_TCP_tracking(void)
{
return 0;
}
-static __inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq)
+static inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq)
{
Acks_keep_track_info[Opened_TCP_session].Ack_seq_num = seq;
Acks_keep_track_info[Opened_TCP_session].Bigger_Ack_num = 0;
@@ -334,7 +334,7 @@ static __inline int add_TCP_track_session(u32 src_prt, u32 dst_prt, u32 seq)
return 0;
}
-static __inline int Update_TCP_track_session(u32 index, u32 Ack)
+static inline int Update_TCP_track_session(u32 index, u32 Ack)
{
if (Ack > Acks_keep_track_info[index].Bigger_Ack_num) {
@@ -343,7 +343,7 @@ static __inline int Update_TCP_track_session(u32 index, u32 Ack)
return 0;
}
-static __inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_entry_t *txqe)
+static inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_entry_t *txqe)
{
Statisitcs_totalAcks++;
if (Pending_Acks < MAX_PENDING_ACKS) {
@@ -358,7 +358,7 @@ static __inline int add_TCP_Pending_Ack(u32 Ack, u32 Session_index, struct txq_e
}
return 0;
}
-static __inline int remove_TCP_related(void)
+static inline int remove_TCP_related(void)
{
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
unsigned long flags;
@@ -369,7 +369,7 @@ static __inline int remove_TCP_related(void)
return 0;
}
-static __inline int tcp_process(struct txq_entry_t *tqe)
+static inline int tcp_process(struct txq_entry_t *tqe)
{
int ret;
u8 *eth_hdr_ptr;
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 2/8] staging: wilc1000: replace __inline with inline Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 10:34 ` Sudip Mukherjee
2015-09-17 7:48 ` [PATCH V2 4/8] staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check Chaehyun Lim
` (5 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch replaces int8_t with int. just use return type as int.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a2c80db..e9e6d9c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -272,9 +272,9 @@ static void clear_duringIP(unsigned long arg)
}
#endif
-int8_t is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid)
+int is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid)
{
- int8_t state = -1;
+ int state = -1;
int i;
if (u32LastScannedNtwrksCountShadow == 0) {
@@ -297,7 +297,7 @@ int8_t is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid)
void add_network_to_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
{
- int8_t ap_found = is_network_in_shadow(pstrNetworkInfo, pUserVoid);
+ int ap_found = is_network_in_shadow(pstrNetworkInfo, pUserVoid);
u32 ap_index = 0;
u8 rssi_index = 0;
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 4/8] staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 2/8] staging: wilc1000: replace __inline with inline Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 3/8] staging: wilc1000: replace int8_t with int Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 5/8] staging: wilc1000: remove unused defines Chaehyun Lim
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch fixes error check of kzalloc.
If kzalloc is failed, return type is used as -ENOMEM.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/linux_wlan_spi.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
index 3e24256..51bbd96 100644
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -125,10 +125,8 @@ int linux_spi_write(u8 *b, u32 len)
int remainder = len % TXRX_PHASE_SIZE;
char *r_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL);
-
- if (!r_buffer) {
- PRINT_ER("Failed to allocate memory for r_buffer\n");
- }
+ if (!r_buffer)
+ return -ENOMEM;
if (blk) {
while (i < blk) {
@@ -208,10 +206,9 @@ int linux_spi_write(u8 *b, u32 len)
.delay_usecs = 0,
};
char *r_buffer = kzalloc(len, GFP_KERNEL);
+ if (!r_buffer)
+ return -ENOMEM;
- if (!r_buffer) {
- PRINT_ER("Failed to allocate memory for r_buffer\n");
- }
tr.rx_buf = r_buffer;
PRINT_D(BUS_DBG, "Request writing %d bytes\n", len);
@@ -257,10 +254,8 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
int remainder = rlen % TXRX_PHASE_SIZE;
char *t_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL);
-
- if (!t_buffer) {
- PRINT_ER("Failed to allocate memory for t_buffer\n");
- }
+ if (!t_buffer)
+ return -ENOMEM;
if (blk) {
while (i < blk) {
@@ -337,10 +332,9 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
};
char *t_buffer = kzalloc(rlen, GFP_KERNEL);
+ if (!t_buffer)
+ return -ENOMEM;
- if (!t_buffer) {
- PRINT_ER("Failed to allocate memory for t_buffer\n");
- }
tr.tx_buf = t_buffer;
memset(&msg, 0, sizeof(msg));
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 5/8] staging: wilc1000: remove unused defines
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
` (2 preceding siblings ...)
2015-09-17 7:48 ` [PATCH V2 4/8] staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 6/8] staging: wilc1000: remove WILC_TIME typedef Chaehyun Lim
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes unused defines.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_platform.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h
index 1e56973..5c867ec 100644
--- a/drivers/staging/wilc1000/wilc_platform.h
+++ b/drivers/staging/wilc1000/wilc_platform.h
@@ -41,8 +41,4 @@ typedef time_t WILC_Time;
* others
********************************************************************/
-/* Generic printf function */
-#define __WILC_FILE__ __FILE__
-#define __WILC_FUNCTION__ __func__
-#define __WILC_LINE__ __LINE__
#endif
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 6/8] staging: wilc1000: remove WILC_TIME typedef
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
` (3 preceding siblings ...)
2015-09-17 7:48 ` [PATCH V2 5/8] staging: wilc1000: remove unused defines Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 7/8] staging: wilc1000: remove useless comment Chaehyun Lim
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes WILC_TIME typedef that is not used anymore.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_platform.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h
index 5c867ec..b763616 100644
--- a/drivers/staging/wilc1000/wilc_platform.h
+++ b/drivers/staging/wilc1000/wilc_platform.h
@@ -33,8 +33,6 @@ typedef struct __MessageQueue_struct {
-/*Time represented in 64 bit format*/
-typedef time_t WILC_Time;
/*******************************************************************
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 7/8] staging: wilc1000: remove useless comment
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
` (4 preceding siblings ...)
2015-09-17 7:48 ` [PATCH V2 6/8] staging: wilc1000: remove WILC_TIME typedef Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 8/8] staging: wilc1000: remove declaration of wilc_get_chipid Chaehyun Lim
2015-09-17 10:24 ` [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Sudip Mukherjee
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes useless comment that is included "BugID_xxxx"
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 36 -------------------
drivers/staging/wilc1000/host_interface.h | 4 ---
drivers/staging/wilc1000/linux_wlan.c | 8 -----
drivers/staging/wilc1000/linux_wlan_common.h | 1 -
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 42 -----------------------
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 -
drivers/staging/wilc1000/wilc_wlan.c | 26 ++------------
drivers/staging/wilc1000/wilc_wlan.h | 1 -
drivers/staging/wilc1000/wilc_wlan_if.h | 9 -----
9 files changed, 2 insertions(+), 126 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6fdf392..c63c5ee 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -7,7 +7,6 @@ extern u8 connecting;
extern struct timer_list hDuringIpTimer;
#endif
-/*BugID_5137*/
extern u8 g_wilc_initialized;
/*****************************************************************************/
/* Macros */
@@ -173,7 +172,6 @@ typedef struct _tstrHostIFscanAttr {
size_t IEsLen;
tWILCpfScanResult pfScanResult;
void *pvUserArg;
- /*BugID_4189*/
tstrHiddenNetwork strHiddenNetwork;
} tstrHostIFscanAttr;
@@ -563,7 +561,6 @@ static u32 gu32InactiveTime;
static u8 gu8DelBcn;
static u32 gu32WidConnRstHack;
-/*BugID_5137*/
u8 *gu8FlushedJoinReq;
u8 *gu8FlushedInfoElemAsoc;
u8 gu8Flushed11iMode;
@@ -888,7 +885,6 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler, tstrHostIfSetMacAdd
}
-/*BugID_5213*/
/**
* @brief Handle_GetMacAddress
* @details Getting mac address
@@ -1330,7 +1326,6 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr *pstrHost
pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0;
- /*BugID_4189*/
strWIDList[u32WidsCount].u16WIDid = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].enuWIDtype = WID_STR;
@@ -1474,7 +1469,6 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent)
PRINT_D(HOSTINF_DBG, "in Handle_ScanDone()\n");
- /*BugID_4978*/
/*Ask FW to abort the running scan, if any*/
if (enuEvent == SCAN_EVENT_ABORTED) {
PRINT_D(GENERIC_DBG, "Abort running scan\n");
@@ -1772,7 +1766,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
strWIDList[u32WidsCount].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
u32WidsCount++;
- /*BugID_5137*/
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
gu32FlushedInfoElemAsocSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
@@ -1787,7 +1780,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
u32WidsCount++;
- /*BugID_5137*/
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
gu8Flushed11iMode = pstrWFIDrv->strWILC_UsrConnReq.u8security;
@@ -1800,7 +1792,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
u32WidsCount++;
- /*BugID_5137*/
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
gu8FlushedAuthType = (u8)pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type;
@@ -1857,7 +1848,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */
strWIDList[u32WidsCount].ps8WidVal = kmalloc(strWIDList[u32WidsCount].s32ValueSize, GFP_KERNEL);
- /*BugID_5137*/
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
gu32FlushedJoinReqSize = strWIDList[u32WidsCount].s32ValueSize;
gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
@@ -1943,7 +1933,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
memcpy(pu8CurrByte, ptstrJoinBssParam->rsn_cap, sizeof(ptstrJoinBssParam->rsn_cap));
pu8CurrByte += sizeof(ptstrJoinBssParam->rsn_cap);
- /*BugID_5137*/
*(pu8CurrByte++) = REAL_JOIN_REQ;
*(pu8CurrByte++) = ptstrJoinBssParam->u8NoaEnbaled;
@@ -1993,7 +1982,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
gu32WidConnRstHack = 0;
/* ////////////////////// */
- /*BugID_5137*/
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize);
gu8FlushedJoinReqDrvHandler = pstrWFIDrv;
@@ -2244,7 +2232,6 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler)
}
memset(u8ConnectedSSID, 0, ETH_ALEN);
- /*BugID_5213*/
/*Freeing flushed join request params on connect timeout*/
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {
kfree(gu8FlushedJoinReq);
@@ -2666,7 +2653,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy
pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = NULL;
}
- /*BugID_5213*/
/*Freeing flushed join request params on receiving*/
/*MAC_DISCONNECTED while connected*/
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {
@@ -3125,7 +3111,6 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler)
if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult != NULL) {
- /*BugID_5193*/
/*Stop connect timer, if connection in progress*/
if (pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {
PRINT_D(HOSTINF_DBG, "Upper layer requested termination of connection\n");
@@ -3164,7 +3149,6 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler)
}
- /*BugID_5137*/
if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {
kfree(gu8FlushedJoinReq);
gu8FlushedJoinReq = NULL;
@@ -3931,7 +3915,6 @@ static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, tstrHostIfRema
PRINT_D(HOSTINF_DBG, "CANCEL REMAIN ON CHAN\n");
- /*BugID_5477*/
/*Make sure we are already in listen state*/
/*This is to handle duplicate expiry messages (listen timer fired and supplicant called cancel_remain_on_channel())*/
if (P2P_LISTEN_STATE) {
@@ -4084,7 +4067,6 @@ ERRORHANDLER:
}
-/*BugID_5222*/
/**
* @brief Handle_AddBASession
* @details Add block ack session
@@ -4174,7 +4156,6 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI
}
-/*BugID_5222*/
/**
* @brief Handle_DelBASession
* @details Delete block ack session
@@ -4239,7 +4220,6 @@ static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI
if (strWID.ps8WidVal != NULL)
kfree(strWID.ps8WidVal);
- /*BugID_5222*/
up(&hWaitResponse);
return s32Error;
@@ -4294,7 +4274,6 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASe
if (strWID.ps8WidVal != NULL)
kfree(strWID.ps8WidVal);
- /*BugID_5222*/
up(&hWaitResponse);
return s32Error;
@@ -4355,7 +4334,6 @@ static int hostIFthread(void *pvArg)
Handle_Connect(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr);
break;
- /*BugID_5137*/
case HOST_IF_MSG_FLUSH_CONNECT:
Handle_FlushConnect(strHostIFmsg.drvHandler);
break;
@@ -4389,7 +4367,6 @@ static int hostIFthread(void *pvArg)
del_timer(&pstrWFIDrv->hScanTimer);
PRINT_D(HOSTINF_DBG, "scan completed successfully\n");
- /*BugID_5213*/
/*Allow chip sleep, only if both interfaces are not connected*/
if (!linux_wlan_get_num_conn_ifcs())
chip_sleep_manually(INFINITE_SLEEP_TIME);
@@ -4475,12 +4452,10 @@ static int hostIFthread(void *pvArg)
Handle_get_IPAddress(strHostIFmsg.drvHandler, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx);
break;
- /*BugID_5077*/
case HOST_IF_MSG_SET_MAC_ADDRESS:
Handle_SetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress);
break;
- /*BugID_5213*/
case HOST_IF_MSG_GET_MAC_ADDRESS:
Handle_GetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress);
break;
@@ -4504,7 +4479,6 @@ static int hostIFthread(void *pvArg)
Handle_SetMulticastFilter(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti);
break;
- /*BugID_5222*/
case HOST_IF_MSG_ADD_BA_SESSION:
Handle_AddBASession(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo);
break;
@@ -6421,7 +6395,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
if (clients_count == 0) {
sema_init(&hSemHostIFthrdEnd, 0);
sema_init(&hSemDeinitDrvHandle, 0);
- /*BugID_5348*/
sema_init(&hSemHostIntDeinit, 1);
}
@@ -6544,7 +6517,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
* return 0;
* }*/
- /*BugID_5348*/
if (pstrWFIDrv == NULL) {
PRINT_ER("pstrWFIDrv = NULL\n");
@@ -6556,7 +6528,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
terminated_handle = pstrWFIDrv;
PRINT_D(HOSTINF_DBG, "De-initializing host interface for client %d\n", clients_count);
- /*BugID_5348*/
/*Destroy all timers before acquiring hSemDeinitDrvHandle*/
/*to guarantee handling all messages befor proceeding*/
if (del_timer_sync(&pstrWFIDrv->hScanTimer)) {
@@ -6703,7 +6674,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL;
- /*BugID_5348*/
down(&hSemHostIntDeinit);
id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
@@ -6713,7 +6683,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
if (pstrWFIDrv == NULL || pstrWFIDrv == terminated_handle) {
PRINT_D(HOSTINF_DBG, "Wifi driver handler is equal to NULL\n");
- /*BugID_5348*/
up(&hSemHostIntDeinit);
return;
}
@@ -6721,7 +6690,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == NULL) {
/* received mac status is not needed when there is no current Connect Request */
PRINT_ER("Received mac status is not needed when there is no current Connect Reques\n");
- /*BugID_5348*/
up(&hSemHostIntDeinit);
return;
}
@@ -6744,7 +6712,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
if (s32Error)
PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
- /*BugID_5348*/
up(&hSemHostIntDeinit);
}
@@ -7126,7 +7093,6 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_STATION;
strHostIFmsg.drvHandler = hWFIDrv;
- /*BugID_4795: Handling situation of deleting all stations*/
if (pu8MacAddr == NULL)
memset(pstrDelStationMsg->au8MacAddr, 255, ETH_ALEN);
else
@@ -7604,7 +7570,6 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
- /*BugID_5222*/
down(&hWaitResponse);
return s32Error;
@@ -7635,7 +7600,6 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
- /*BugID_5222*/
down(&hWaitResponse);
return s32Error;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index fd5fa19..c1a9cce 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -216,7 +216,6 @@ typedef struct _tstrRcvdNetworkInfo {
u32 u32Length;
} tstrRcvdNetworkInfo;
-/*BugID_4156*/
typedef struct _tstrHiddenNetworkInfo {
u8 *pu8ssid;
u8 u8ssidlen;
@@ -264,17 +263,14 @@ typedef struct {
u32 u32Mode;
} tstrHostIfSetOperationMode;
-/*BugID_5077*/
typedef struct {
u8 u8MacAddress[ETH_ALEN];
} tstrHostIfSetMacAddress;
-/*BugID_5213*/
typedef struct {
u8 *u8MacAddress;
} tstrHostIfGetMacAddress;
-/*BugID_5222*/
typedef struct {
u8 au8Bssid[ETH_ALEN];
u8 u8Ted;
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index a4f43d2..bb16518 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -572,7 +572,6 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID)
return ret;
}
-/*BugID_5213*/
/*Function to get number of connected interfaces*/
int linux_wlan_get_num_conn_ifcs(void)
{
@@ -679,7 +678,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
else if (nic->iftype == STATION_MODE)
firmware = STA_FIRMWARE;
- /*BugID_5137*/
else {
PRINT_D(INIT_DBG, "Get P2P_CONCURRENCY_FIRMWARE\n");
firmware = P2P_CONCURRENCY_FIRMWARE;
@@ -800,7 +798,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
unsigned char c_val[64];
unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff};
- /*BugID_5077*/
struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv;
@@ -1147,7 +1144,6 @@ int wlan_init_locks(linux_wlan_t *p_nic)
mutex_init(&g_linux_wlan->rxq_cs);
mutex_init(&g_linux_wlan->txq_cs);
- /*Added by Amr - BugID_4720*/
spin_lock_init(&g_linux_wlan->txq_spinlock);
sema_init(&g_linux_wlan->txq_add_to_head_cs, 1);
@@ -1190,10 +1186,8 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
nwi->os_context.tx_buffer_size = LINUX_TX_SIZE;
nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs;
- /*Added by Amr - BugID_4720*/
nwi->os_context.txq_add_to_head_critical_section = (void *)&g_linux_wlan->txq_add_to_head_cs;
- /*Added by Amr - BugID_4720*/
nwi->os_context.txq_spin_lock = (void *)&g_linux_wlan->txq_spinlock;
nwi->os_context.txq_wait_event = (void *)&g_linux_wlan->txq_event;
@@ -1559,7 +1553,6 @@ int mac_open(struct net_device *ndev)
{
perInterface_wlan_t *nic;
- /*BugID_5213*/
/*No need for setting mac address here anymore,*/
/*Just set it in init_test_config()*/
unsigned char mac_add[ETH_ALEN] = {0};
@@ -1969,7 +1962,6 @@ void WILC_WFI_mgmt_rx(u8 *buff, u32 size)
int i = 0;
perInterface_wlan_t *nic;
- /*BugID_5450*/
/*Pass the frame on the monitor interface, if any.*/
/*Otherwise, pass it on p2p0 netdev, if registered on it*/
for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h
index 5d13c15..9478e82 100644
--- a/drivers/staging/wilc1000/linux_wlan_common.h
+++ b/drivers/staging/wilc1000/linux_wlan_common.h
@@ -12,7 +12,6 @@ enum debug_region {
RX_debug,
Lock_debug,
Tcp_enhance,
- /*Added by amr - BugID_4720*/
Spin_debug,
Init_debug,
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e9e6d9c..0acdcf8 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -37,7 +37,6 @@ struct timer_list hAgingTimer;
static u8 op_ifcs;
extern u8 u8ConnectedSSID[6];
-/*BugID_5137*/
u8 g_wilc_initialized = 1;
extern linux_wlan_t *g_linux_wlan;
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
@@ -102,7 +101,6 @@ struct p2p_mgmt_data {
/*Global variable used to state the current connected STA channel*/
u8 u8WLANChannel = INVALID_CHANNEL;
-/*BugID_5442*/
u8 u8CurrChannel;
u8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09};
@@ -119,7 +117,6 @@ static struct ieee80211_supported_band WILC_WFI_band_2ghz = {
};
-/*BugID_5137*/
struct add_key_params {
u8 key_idx;
bool pairwise;
@@ -573,7 +570,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
linux_wlan_set_bssid(priv->dev, NullBssid);
memset(u8ConnectedSSID, 0, ETH_ALEN);
- /*BugID_5457*/
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
if (!pstrWFIDrv->u8P2PConnect)
u8WLANChannel = INVALID_CHANNEL;
@@ -589,9 +585,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
pstrConnectInfo->au8bssid[1], pstrConnectInfo->au8bssid[2], pstrConnectInfo->au8bssid[3], pstrConnectInfo->au8bssid[4], pstrConnectInfo->au8bssid[5]);
memcpy(priv->au8AssociatedBss, pstrConnectInfo->au8bssid, ETH_ALEN);
- /* BugID_4209: if this network has expired in the scan results in the above nl80211 layer, refresh them here by calling
- * cfg80211_inform_bss() with the last Scan results before calling cfg80211_connect_result() to avoid
- * Linux kernel warning generated at the nl80211 layer */
for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,
@@ -608,7 +601,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
}
if (bNeedScanRefresh) {
- /*BugID_5418*/
/*Also, refrsh DIRECT- results if */
refresh_scan(priv, 1, true);
@@ -639,17 +631,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
linux_wlan_set_bssid(priv->dev, NullBssid);
memset(u8ConnectedSSID, 0, ETH_ALEN);
- /*BugID_5457*/
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
if (!pstrWFIDrv->u8P2PConnect)
u8WLANChannel = INVALID_CHANNEL;
- /*BugID_5315*/
/*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change
* virtual interface to station*/
if ((pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->strInterfaceInfo[1].wilc_netdev)) {
pstrDisconnectNotifInfo->u16reason = 3;
}
- /*BugID_5315*/
/*Incase "P2P CLIENT during connection(not connected)" send deauthentication reason by 1 to force the WPA_SUPPLICANT
* to scan again and retry the connection*/
else if ((!pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->strInterfaceInfo[1].wilc_netdev)) {
@@ -755,7 +744,6 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
strHiddenNetwork.u8ssidnum = request->n_ssids;
- /*BugID_4156*/
for (i = 0; i < request->n_ssids; i++) {
if (request->ssids[i].ssid != NULL && request->ssids[i].ssid_len != 0) {
@@ -911,7 +899,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;
memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);
- /*BugID_5137*/
g_key_wep_params.key_len = sme->key_len;
g_key_wep_params.key = kmalloc(sme->key_len, GFP_KERNEL);
memcpy(g_key_wep_params.key, sme->key, sme->key_len);
@@ -929,7 +916,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;
memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);
- /*BugID_5137*/
g_key_wep_params.key_len = sme->key_len;
g_key_wep_params.key = kmalloc(sme->key_len, GFP_KERNEL);
memcpy(g_key_wep_params.key, sme->key, sme->key_len);
@@ -1023,7 +1009,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
PRINT_INFO(CFG80211_DBG, "Group encryption value = %s\n Cipher Group = %s\n WPA version = %s\n",
pcgroup_encrypt_val, pccipher_group, pcwpa_version);
- /*BugID_5442*/
u8CurrChannel = pstrNetworkInfo->u8channel;
if (!pstrWFIDrv->u8P2PConnect) {
@@ -1068,7 +1053,6 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
connecting = 0;
priv = wiphy_priv(wiphy);
- /*BugID_5457*/
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;
if (!pstrWFIDrv->u8P2PConnect)
@@ -1120,7 +1104,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
PRINT_D(CFG80211_DBG, "Adding key with cipher suite = %x\n", params->cipher);
- /*BugID_5137*/
PRINT_D(CFG80211_DBG, "%p %p %d\n", wiphy, netdev, key_index);
PRINT_D(CFG80211_DBG, "key %x %x %x\n", params->key[0],
@@ -1292,7 +1275,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
KeyLen = params->key_len - 16;
}
- /*BugID_5137*/
/*save keys only on interface 0 (wifi interface)*/
if (!g_gtk_keys_saved && netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {
g_add_gtk_key_params.key_idx = key_index;
@@ -1329,7 +1311,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
KeyLen = params->key_len - 16;
}
- /*BugID_5137*/
/*save keys only on interface 0 (wifi interface)*/
if (!g_ptk_keys_saved && netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {
g_add_ptk_key_params.key_idx = key_index;
@@ -1396,7 +1377,6 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
priv = wiphy_priv(wiphy);
- /*BugID_5137*/
/*delete saved keys, if any*/
if (netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {
g_ptk_keys_saved = false;
@@ -1987,7 +1967,6 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
u32 index = 0;
u32 i = 0, j = 0;
- /*BugID_5460*/
u8 op_channel_attr_index = 0;
u8 channel_list_attr_index = 0;
@@ -2131,7 +2110,6 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
PRINT_D(GENERIC_DBG, "Rx Frame Type:%x\n", buff[FRAME_TYPE_ID]);
- /*BugID_5442*/
/*Upper layer is informed that the frame is received on this freq*/
s32Freq = ieee80211_channel_to_frequency(u8CurrChannel, IEEE80211_BAND_2GHZ);
@@ -2265,7 +2243,6 @@ static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, u32 u32SessionID)
priv = (struct wilc_priv *)pUserVoid;
- /*BugID_5477*/
if (u32SessionID == priv->strRemainOnChanParams.u32ListenSessionID) {
PRINT_D(GENERIC_DBG, "Remain on channel expired\n");
@@ -2308,9 +2285,6 @@ static int remain_on_channel(struct wiphy *wiphy,
PRINT_D(GENERIC_DBG, "Remaining on channel %d\n", chan->hw_value);
- /*BugID_4800: if in AP mode, return.*/
- /*This check is to handle the situation when user*/
- /*requests "create group" during a running scan*/
if (wdev->iftype == NL80211_IFTYPE_AP) {
PRINT_D(GENERIC_DBG, "Required remain-on-channel while in AP mode");
@@ -2443,9 +2417,7 @@ int mgmt_tx(struct wiphy *wiphy,
PRINT_D(GENERIC_DBG, "ACTION FRAME:%x\n", (u16)mgmt->frame_control);
- /*BugID_4847*/
if (buf[ACTION_CAT_ID] == PUB_ACTION_ATTR_ID) {
- /*BugID_4847*/
/*Only set the channel, if not a negotiation confirmation frame
* (If Negotiation confirmation frame, force it
* to be transmitted on the same negotiation channel)*/
@@ -2495,7 +2467,6 @@ int mgmt_tx(struct wiphy *wiphy,
if (buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)
WILC_WFI_CfgParseTxAction(&mgmt_tx->buff[i + 6], len - (i + 6), true, nic->iftype);
- /*BugID_5460*/
/*If using supplicant go intent, no need at all*/
/*to parse transmitted negotiation frames*/
else
@@ -2594,7 +2565,6 @@ void WILC_WFI_frame_register(struct wiphy *wiphy,
- /*BugID_5137*/
if (!frame_type)
return;
@@ -2754,7 +2724,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
del_timer(&hDuringIpTimer);
PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n");
#endif
- /*BugID_5137*/
/*Set WILC_CHANGING_VIR_IF register to disallow adding futrue keys to CE H/W*/
if (g_ptk_keys_saved && g_gtk_keys_saved) {
Set_machw_change_vir_if(true);
@@ -2783,7 +2752,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/* ensure that the message Q is empty */
host_int_wait_msg_queue_idle();
- /*BugID_5213*/
/*Eliminate host interface blocking state*/
up(&g_linux_wlan->cfg_event);
@@ -2835,8 +2803,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
(struct key_params *)(&g_key_gtk_params));
}
- /*BugID_4847: registered frames in firmware are now*/
- /*lost due to mac close. So re-register those frames*/
if (g_linux_wlan->wilc1000_initialized) {
for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -2922,8 +2888,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
refresh_scan(priv, 1, true);
Set_machw_change_vir_if(false);
- /*BugID_4847: registered frames in firmware are now lost
- * due to mac close. So re-register those frames */
if (g_linux_wlan->wilc1000_initialized) {
for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -2953,8 +2917,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
mac_close(dev);
mac_open(dev);
- /*BugID_4847: registered frames in firmware are now lost
- * due to mac close. So re-register those frames */
for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
nic->g_struct_frame_reg[i].reg);
@@ -2973,7 +2935,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
mod_timer(&hDuringIpTimer, jiffies + msecs_to_jiffies(duringIP_TIME));
#endif
host_int_set_power_mgmt(priv->hWILCWFIDrv, 0, 0);
- /*BugID_5222*/
/*Delete block ack has to be the latest config packet*/
/*sent before downloading new FW. This is because it blocks on*/
/*hWaitResponse semaphore, which allows previous config*/
@@ -3047,8 +3008,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
}
#endif
- /*BugID_4847: registered frames in firmware are now*/
- /*lost due to mac close. So re-register those frames*/
if (g_linux_wlan->wilc1000_initialized) {
for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -3178,7 +3137,6 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
PRINT_D(HOSTAPD_DBG, "Deleting beacon\n");
- /*BugID_5188*/
linux_wlan_set_bssid(dev, NullBssid);
s32Error = host_int_del_beacon(priv->hWILCWFIDrv);
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index aa96ef3..dddf28d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -180,7 +180,6 @@ typedef struct {
u8 open_ifcs;
struct mutex txq_cs;
- /*Added by Amr - BugID_4720*/
struct semaphore txq_add_to_head_cs;
spinlock_t txq_spinlock;
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 1fe1ba5..e12dd01 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -71,7 +71,6 @@ typedef struct {
**/
void *txq_lock;
- /*Added by Amr - BugID_4720*/
struct semaphore *txq_add_to_head_lock;
void *txq_spinlock;
unsigned long txq_spinlock_flags;
@@ -123,7 +122,6 @@ static void wilc_debug(u32 flag, char *fmt, ...)
static CHIP_PS_STATE_T genuChipPSstate = CHIP_WAKEDUP;
-/*BugID_5213*/
/*acquire_bus() and release_bus() are made static inline functions*/
/*as a temporary workaround to fix a problem of receiving*/
/*unknown interrupt from FW*/
@@ -193,7 +191,6 @@ static struct txq_entry_t *wilc_wlan_txq_remove_from_head(void)
}
p->txq_entries -= 1;
- /*Added by Amr - BugID_4720*/
@@ -208,7 +205,6 @@ static void wilc_wlan_txq_add_to_tail(struct txq_entry_t *tqe)
{
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
unsigned long flags;
- /*Added by Amr - BugID_4720*/
spin_lock_irqsave(p->txq_spinlock, flags);
if (p->txq_head == NULL) {
@@ -225,7 +221,6 @@ static void wilc_wlan_txq_add_to_tail(struct txq_entry_t *tqe)
p->txq_entries += 1;
PRINT_D(TX_DBG, "Number of entries in TxQ = %d\n", p->txq_entries);
- /*Added by Amr - BugID_4720*/
spin_unlock_irqrestore(p->txq_spinlock, flags);
/**
@@ -240,7 +235,6 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
{
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
unsigned long flags;
- /*Added by Amr - BugID_4720*/
if (p->os_func.os_wait(p->txq_add_to_head_lock, CFG_PKTS_TIMEOUT))
return -1;
@@ -260,7 +254,6 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
p->txq_entries += 1;
PRINT_D(TX_DBG, "Number of entries in TxQ = %d\n", p->txq_entries);
- /*Added by Amr - BugID_4720*/
spin_unlock_irqrestore(p->txq_spinlock, flags);
up(p->txq_add_to_head_lock);
@@ -271,7 +264,6 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
up(p->txq_wait);
PRINT_D(TX_DBG, "Wake up the txq_handler\n");
- /*Added by Amr - BugID_4720*/
return 0;
}
@@ -521,7 +513,6 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size)
**/
PRINT_D(TX_DBG, "Adding the config packet at the Queue tail\n");
- /*Edited by Amr - BugID_4720*/
if (wilc_wlan_txq_add_to_head(tqe))
return 0;
return 1;
@@ -589,12 +580,10 @@ static struct txq_entry_t *wilc_wlan_txq_get_first(void)
struct txq_entry_t *tqe;
unsigned long flags;
- /*Added by Amr - BugID_4720*/
spin_lock_irqsave(p->txq_spinlock, flags);
tqe = p->txq_head;
- /*Added by Amr - BugID_4720*/
spin_unlock_irqrestore(p->txq_spinlock, flags);
@@ -605,11 +594,9 @@ static struct txq_entry_t *wilc_wlan_txq_get_next(struct txq_entry_t *tqe)
{
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
unsigned long flags;
- /*Added by Amr - BugID_4720*/
spin_lock_irqsave(p->txq_spinlock, flags);
tqe = tqe->next;
- /*Added by Amr - BugID_4720*/
spin_unlock_irqrestore(p->txq_spinlock, flags);
@@ -864,7 +851,6 @@ static int wilc_wlan_handle_txq(u32 *pu32TxqCount)
if (p->quit)
break;
- /*Added by Amr - BugID_4720*/
p->os_func.os_wait(p->txq_add_to_head_lock, CFG_PKTS_TIMEOUT);
#ifdef TCP_ACK_FILTER
wilc_wlan_txq_filter_dup_tcp_ack();
@@ -1142,7 +1128,6 @@ _end_:
if (ret != 1)
break;
} while (0);
- /*Added by Amr - BugID_4720*/
up(p->txq_add_to_head_lock);
p->txq_exit = 1;
@@ -1581,13 +1566,11 @@ static int wilc_wlan_start(void)
reg |= WILC_HAVE_LEGACY_RF_SETTINGS;
-/*BugID_5257*/
/*Set oscillator frequency*/
#ifdef XTAL_24
reg |= WILC_HAVE_XTAL_24;
#endif
-/*BugID_5271*/
/*Enable/Disable GPIO configuration for FW logs*/
#ifdef DISABLE_WILC_UART
reg |= WILC_HAVE_DISABLE_WILC_UART;
@@ -1812,7 +1795,6 @@ static int wilc_wlan_cfg_commit(int type, u32 drvHandler)
* Add to TX queue
**/
- /*Edited by Amr - BugID_4720*/
if (!wilc_wlan_txq_add_cfg_pkt(&cfg->wid_header[0], total_len))
return -1;
@@ -1842,9 +1824,8 @@ static int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, in
PRINT_D(RX_DBG, "Processing cfg_set()\n");
p->cfg_frame_in_use = 1;
- /*Edited by Amr - BugID_4720*/
if (wilc_wlan_cfg_commit(WILC_CFG_SET, drvHandler))
- ret_size = 0; /* BugID_5213 */
+ ret_size = 0;
if (p->os_func.os_wait(p->cfg_wait, CFG_PKTS_TIMEOUT)) {
PRINT_D(TX_DBG, "Set Timed Out\n");
@@ -1879,9 +1860,8 @@ static int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
if (commit) {
p->cfg_frame_in_use = 1;
- /*Edited by Amr - BugID_4720*/
if (wilc_wlan_cfg_commit(WILC_CFG_QUERY, drvHandler))
- ret_size = 0; /* BugID_5213 */
+ ret_size = 0;
if (p->os_func.os_wait(p->cfg_wait, CFG_PKTS_TIMEOUT)) {
@@ -2038,10 +2018,8 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
g_wlan.hif_lock = inp->os_context.hif_critical_section;
g_wlan.txq_lock = inp->os_context.txq_critical_section;
- /*Added by Amr - BugID_4720*/
g_wlan.txq_add_to_head_lock = inp->os_context.txq_add_to_head_critical_section;
- /*Added by Amr - BugID_4720*/
g_wlan.txq_spinlock = inp->os_context.txq_spin_lock;
g_wlan.rxq_lock = inp->os_context.rxq_critical_section;
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index c6f1556..9f05b79 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -54,7 +54,6 @@
*
********************************************/
#define WILC_PERIPH_REG_BASE 0x1000
-/*BugID_5137*/
#define WILC_CHANGING_VIR_IF (0x108c)
#define WILC_CHIPID (WILC_PERIPH_REG_BASE)
#define WILC_GLB_RESET_0 (WILC_PERIPH_REG_BASE + 0x400)
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index cc92dc9..0e2937b 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -127,7 +127,6 @@ typedef struct {
u32 tx_buffer_size;
void *txq_critical_section;
- /*Added by Amr - BugID_4720*/
void *txq_add_to_head_critical_section;
void *txq_spin_lock;
@@ -626,7 +625,6 @@ typedef enum {
/* -------------------------------------------------------------------- */
WID_LINK_LOSS_THRESHOLD = 0x0037,
- /*BugID_4978*/
WID_ABORT_RUNNING_SCAN = 0x003E,
/* NMAC Character WID list */
@@ -875,12 +873,9 @@ typedef enum {
WID_REGISTER_FRAME = 0x3084,
WID_DEL_ALL_STA = 0x3085,
WID_REMAIN_ON_CHAN = 0x3996,
- /*BugID_4156*/
WID_SSID_PROBE_REQ = 0x3997,
- /*BugID_4124 WID to trigger modified Join Request using SSID and BSSID instead of bssListIdx (used by WID_JOIN_REQ)*/
WID_JOIN_REQ_EXTENDED = 0x3998,
- /* BugID 4951: WID toset IP address in firmware */
WID_IP_ADDRESS = 0x3999,
@@ -900,19 +895,15 @@ typedef enum {
WID_11N_AUTORATE_TABLE = 0x4080,
- /*Added here by Amr - BugID 4134*/
WID_SCAN_CHANNEL_LIST = 0x4084,
- /*BugID_3746 WID to add IE to be added in next probe request*/
WID_INFO_ELEMENT_PROBE = 0x4085,
- /*BugID_3746 WID to add IE to be added in next associate request*/
WID_INFO_ELEMENT_ASSOCIATE = 0x4086,
WID_ADD_STA = 0X4087,
WID_REMOVE_STA = 0X4088,
WID_EDIT_STA = 0X4089,
WID_ADD_BEACON = 0x408a,
- /* BugID 5108 */
WID_SETUP_MULTICAST_FILTER = 0x408b,
/* Miscellaneous WIDs */
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 8/8] staging: wilc1000: remove declaration of wilc_get_chipid
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
` (5 preceding siblings ...)
2015-09-17 7:48 ` [PATCH V2 7/8] staging: wilc1000: remove useless comment Chaehyun Lim
@ 2015-09-17 7:48 ` Chaehyun Lim
2015-09-17 10:24 ` [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Sudip Mukherjee
7 siblings, 0 replies; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 7:48 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, rachel.kim, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless, devel, Chaehyun Lim
This patch removes the declaration of wilc_get_chipid function.
It is included wilc_wlan_if.h that has declaration of wilc_get_chipid.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c63c5ee..703712e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1,5 +1,6 @@
#include "host_interface.h"
#include "coreconfigurator.h"
+#include "wilc_wlan_if.h"
extern u8 connecting;
@@ -7211,8 +7212,6 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
return s32Error;
}
-u32 wilc_get_chipid(u8);
-
s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Timeout)
{
s32 s32Error = 0;
--
2.5.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V2 1/8] staging: wilc1000: remove INLINE macro
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
` (6 preceding siblings ...)
2015-09-17 7:48 ` [PATCH V2 8/8] staging: wilc1000: remove declaration of wilc_get_chipid Chaehyun Lim
@ 2015-09-17 10:24 ` Sudip Mukherjee
7 siblings, 0 replies; 12+ messages in thread
From: Sudip Mukherjee @ 2015-09-17 10:24 UTC (permalink / raw)
To: Chaehyun Lim
Cc: gregkh, rachel.kim, devel, chris.park, linux-wireless, johnny.kim,
tony.cho, leo.kim
On Thu, Sep 17, 2015 at 04:48:42PM +0900, Chaehyun Lim wrote:
> This patch removes INLINE macro that is used anymore.
used? if used then why are you removing it? :)
regards
sudip
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
2015-09-17 7:48 ` [PATCH V2 3/8] staging: wilc1000: replace int8_t with int Chaehyun Lim
@ 2015-09-17 10:34 ` Sudip Mukherjee
2015-09-17 12:03 ` Chaehyun Lim
0 siblings, 1 reply; 12+ messages in thread
From: Sudip Mukherjee @ 2015-09-17 10:34 UTC (permalink / raw)
To: Chaehyun Lim
Cc: gregkh, rachel.kim, devel, chris.park, linux-wireless, johnny.kim,
tony.cho, leo.kim
On Thu, Sep 17, 2015 at 04:48:44PM +0900, Chaehyun Lim wrote:
> This patch replaces int8_t with int. just use return type as int.
>
> Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
> ---
but isn't int8_t is defined as char?
regards
sudip
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
2015-09-17 10:34 ` Sudip Mukherjee
@ 2015-09-17 12:03 ` Chaehyun Lim
2015-09-19 2:45 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Chaehyun Lim @ 2015-09-17 12:03 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Greg KH, rachel.kim, devel, chris.park, linux-wireless,
johnny.kim, tony.cho, leo.kim
On Thu, Sep 17, 2015 at 7:34 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Thu, Sep 17, 2015 at 04:48:44PM +0900, Chaehyun Lim wrote:
>> This patch replaces int8_t with int. just use return type as int.
>>
>> Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
>> ---
> but isn't int8_t is defined as char?
>
Even int8_t is defined as char, I think it's no problem to use int.
Is it need to change as char?
Regards
Chaehyun Lim
> regards
> sudip
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
2015-09-17 12:03 ` Chaehyun Lim
@ 2015-09-19 2:45 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2015-09-19 2:45 UTC (permalink / raw)
To: Chaehyun Lim
Cc: Sudip Mukherjee, rachel.kim, devel, chris.park, linux-wireless,
johnny.kim, tony.cho, leo.kim
On Thu, Sep 17, 2015 at 09:03:14PM +0900, Chaehyun Lim wrote:
> On Thu, Sep 17, 2015 at 7:34 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > On Thu, Sep 17, 2015 at 04:48:44PM +0900, Chaehyun Lim wrote:
> >> This patch replaces int8_t with int. just use return type as int.
> >>
> >> Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
> >> ---
> > but isn't int8_t is defined as char?
> >
>
> Even int8_t is defined as char, I think it's no problem to use int.
> Is it need to change as char?
No, you need to make it a u8 (or s8, depending on the usage). Be very
careful when changing variable widths.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-09-19 4:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-17 7:48 [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 2/8] staging: wilc1000: replace __inline with inline Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 3/8] staging: wilc1000: replace int8_t with int Chaehyun Lim
2015-09-17 10:34 ` Sudip Mukherjee
2015-09-17 12:03 ` Chaehyun Lim
2015-09-19 2:45 ` Greg KH
2015-09-17 7:48 ` [PATCH V2 4/8] staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 5/8] staging: wilc1000: remove unused defines Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 6/8] staging: wilc1000: remove WILC_TIME typedef Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 7/8] staging: wilc1000: remove useless comment Chaehyun Lim
2015-09-17 7:48 ` [PATCH V2 8/8] staging: wilc1000: remove declaration of wilc_get_chipid Chaehyun Lim
2015-09-17 10:24 ` [PATCH V2 1/8] staging: wilc1000: remove INLINE macro Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).