staging: wilc1000: remove INLINE macro
PATCH v2 1/8 staging: wilc1000: remove INLINE macro
This patch removes INLINE macro that is used anymore.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/coreconfigurator.c | 1 - drivers/staging/wilc1000/wilc_wlan.c | 1 - 2 files changed, 2 deletions(-)
drivers/staging/wilc1000/coreconfigurator.c +0 -1
@@ -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)
drivers/staging/wilc1000/wilc_wlan.c +0 -1
@@ -9,7 +9,6 @@#include "wilc_wlan_if.h" #include "wilc_wlan.h" -#define INLINE static __inline/******************************************** *
Signature · 1 line
2.5.1
PATCH v2 2/8 staging: wilc1000: replace __inline with inline
This patch replaces __inline with inline. plain inline is more preferred than __inline.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_wlan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/wilc1000/wilc_wlan.c +6 -6
@@ -316,13 +316,13 @@ u32 Pending_Acks; -static __inlineint Init_TCP_tracking (void ) +static inline int Init_TCP_tracking (void ) {return 0 ; } -static __inlineint 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 __inlineint 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 __inlineint 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 __inlineint 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 __inlineint tcp_process (struct txq_entry_t *tqe) +static inline int tcp_process (struct txq_entry_t *tqe) {int ret;u8 *eth_hdr_ptr;
Signature · 1 line
2.5.1
PATCH v2 3/8 staging: wilc1000: replace int8_t with int
In reply to Chaehyun LimThis patch replaces int8_t with int. just use return type as int.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -3
@@ -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 ;
Signature · 1 line
2.5.1
Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
Quoted 4 lines · Chaehyun Lim
This patch replaces
int8_twith int. just use return type as int.Signed-off-by Chaehyun Lim <[email protected]>---
but isn't int8_t is defined as char?
regards
sudip
Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
Quoted 7 lines · Sudip Mukherjee
Quoted 4 lines · Chaehyun Lim
This patch replaces
int8_twith int. just use return type as int.Signed-off-by Chaehyun Lim <[email protected]>---
but isn't
int8_tis 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
Quoted 2 lines
regards
sudip
Greg KH
maintainerRe: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
Quoted 5 lines · Chaehyun Lim
Quoted 3 lines · Sudip Mukherjee
Quoted 2 lines · Chaehyun Lim
This patch replaces
int8_twith int. just use return type as int.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Chaehyun Lim <[email protected]>---
but isn't
int8_tis defined as char?Even
int8_tis 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
PATCH v2 4/8 staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check
In reply to Chaehyun LimThis patch fixes error check of kzalloc.
If kzalloc is failed, return type is used as -ENOMEM.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/linux_wlan_spi.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/staging/wilc1000/linux_wlan_spi.c +8 -14
@@ -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));
Signature · 1 line
2.5.1
PATCH v2 5/8 staging: wilc1000: remove unused defines
In reply to Chaehyun LimThis patch removes unused defines.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_platform.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/wilc1000/wilc_platform.h +0 -4
@@ -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
Signature · 1 line
2.5.1
PATCH v2 6/8 staging: wilc1000: remove WILC_TIME typedef
In reply to Chaehyun LimThis patch removes WILC_TIME typedef that is not used anymore.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/wilc_platform.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/wilc1000/wilc_platform.h +0 -2
@@ -33,8 +33,6 @@ typedef struct __MessageQueue_struct { -/*Time represented in 64 bit format*/ -typedef time_t WILC_Time ;/*******************************************************************
Signature · 1 line
2.5.1
PATCH v2 7/8 staging: wilc1000: remove useless comment
In reply to Chaehyun LimThis patch removes useless comment that is included "BugID_xxxx"
---
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(-)
drivers/staging/wilc1000/host_interface.c +0 -36
@@ -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 *psmemcpy (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, tstrHostIfRemaPRINT_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, tstrHostIfBASessionIif (strWID.ps8WidVal !=NULL )kfree (strWID.ps8WidVal); -/*BugID_5222*/ up (&hWaitResponse);return s32Error;
@@ -4294,7 +4274,6 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASeif (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 Tif (s32Error)PRINT_ER ("wilc_mq_send fail\n" ); -/*BugID_5222*/ down (&hWaitResponse);return s32Error;
drivers/staging/wilc1000/host_interface.h +0 -4
@@ -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;
drivers/staging/wilc1000/linux_wlan.c +0 -8
@@ -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_nunsigned 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++) {
drivers/staging/wilc1000/linux_wlan_common.h +0 -1
@@ -12,7 +12,6 @@ enum debug_region { RX_debug, Lock_debug, Tcp_enhance, -/*Added by amr - BugID_4720*/ Spin_debug, Init_debug,
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +0 -42
237 lines not on this page · raw message
drivers/staging/wilc1000/wilc_wfi_netdevice.h +0 -1
@@ -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;
drivers/staging/wilc1000/wilc_wlan.c +2 -24
@@ -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, inPRINT_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;
drivers/staging/wilc1000/wilc_wlan.h +0 -1
@@ -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)
drivers/staging/wilc1000/wilc_wlan_if.h +0 -9
@@ -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 */
Signature · 1 line
2.5.1
PATCH v2 8/8 staging: wilc1000: remove declaration of wilc_get_chipid
In reply to Chaehyun LimThis patch removes the declaration of wilc_get_chipid function. It is included wilc_wlan_if.h that has declaration of wilc_get_chipid.
---
V2 : rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/wilc1000/host_interface.c +1 -2
@@ -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 *pstrStreturn s32Error; } -u32 wilc_get_chipid (u8 ); -s32 host_int_set_power_mgmt (tstrWILC_WFIDrv *hWFIDrv,bool bIsEnabled,u32 u32Timeout) {s32 s32Error =0 ;
Signature · 1 line
2.5.1
Quoted 1 line · Chaehyun Lim
This patch removes INLINE macro that is used anymore.
used? if used then why are you removing it? :)
regards
sudip