staging: rtl8188eu: remove unnecessary parentheses in rtl8188e_cmd.c
PATCH 1/6 staging: rtl8188eu: remove unnecessary parentheses in rtl8188e_cmd.c
Remove unnecessary parentheses reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +21 -21
@@ -211,9 +211,9 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;u32 rate_len, pktlen; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -222,7 +222,7 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength) *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, bc_addr); -ether_addr_copy (pwlanhdr->addr2,myid (&(adapt->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&adapt->eeprompriv));ether_addr_copy (pwlanhdr->addr3, cur_network->MacAddress);SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );
@@ -294,10 +294,10 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)static void ConstructPSPoll (struct adapter *adapt,u8 *pframe,u32 *pLength) {struct ieee80211_hdr *pwlanhdr; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;__le16 *fctrl; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -314,7 +314,7 @@ static void ConstructPSPoll(struct adapter *adapt, u8 *pframe, u32 *pLength)ether_addr_copy (pwlanhdr->addr1, pnetwork->MacAddress);/* TA. */ -ether_addr_copy (pwlanhdr->addr2,myid (&(adapt->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&adapt->eeprompriv)); *pLength =16 ; }
@@ -332,9 +332,9 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,u32 pktlen;struct mlme_priv *pmlmepriv = &adapt->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -347,19 +347,19 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,case Ndis802_11Infrastructure:SetToDs (fctrl);ether_addr_copy (pwlanhdr->addr1, pnetwork->MacAddress); -ether_addr_copy (pwlanhdr->addr2,myid (&(adapt->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&adapt->eeprompriv));ether_addr_copy (pwlanhdr->addr3, StaAddr);break ;case Ndis802_11APMode:SetFrDs (fctrl);ether_addr_copy (pwlanhdr->addr1, StaAddr);ether_addr_copy (pwlanhdr->addr2, pnetwork->MacAddress); -ether_addr_copy (pwlanhdr->addr3,myid (&(adapt->eeprompriv))); +ether_addr_copy (pwlanhdr->addr3,myid (&adapt->eeprompriv));break ;case Ndis802_11IBSS:default :ether_addr_copy (pwlanhdr->addr1, StaAddr); -ether_addr_copy (pwlanhdr->addr2,myid (&(adapt->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&adapt->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);break ; }
@@ -391,13 +391,13 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u__le16 *fctrl;u8 *mac, *bssid;u32 pktlen; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; pwlanhdr = (struct ieee80211_hdr *)pframe; - mac =myid (&(adapt->eeprompriv)); + mac =myid (&adapt->eeprompriv); bssid = cur_network->MacAddress; fctrl = &pwlanhdr->frame_control;
@@ -458,7 +458,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) pxmitpriv = &adapt->xmitpriv; pmlmeext = &adapt->mlmeextpriv; pmlmeinfo = &pmlmeext->mlmext_info; - pnetwork = &(pmlmeinfo->network); + pnetwork = &pmlmeinfo->network; TxDescLen =TXDESC_SIZE ; PageNum =0 ;
@@ -542,8 +542,8 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished)void rtl8188e_set_FwJoinBssReport_cmd (struct adapter *adapt,u8 mstatus) {struct hal_data_8188e *haldata = adapt->HalData; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;bool bSendBeacon = false;bool bcn_valid = false;u8 DLBcnCount =0 ;
Signature · 1 line
2.20.1
PATCH 2/6 staging: rtl8188eu: cleanup declarations in rtl8188e_cmd.c
Replace tabs with spaces in declarations to cleanup whitespace.
--- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +14 -14
@@ -22,7 +22,7 @@static u8 _is_fw_read_cmd_down (struct adapter *adapt,u8 msgbox_num) {u8 read_down = false; -int retry_cnts =100 ; +int retry_cnts =100 ;u8 valid;
@@ -212,8 +212,8 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)__le16 *fctrl;u32 rate_len, pktlen;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -295,7 +295,7 @@ static void ConstructPSPoll(struct adapter *adapt, u8 *pframe, u32 *pLength) {struct ieee80211_hdr *pwlanhdr;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;__le16 *fctrl;struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
@@ -331,9 +331,9 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,__le16 *fctrl;u32 pktlen;struct mlme_priv *pmlmepriv = &adapt->mlmepriv; -struct wlan_network *cur_network = &pmlmepriv->cur_network; +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -392,8 +392,8 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, uu8 *mac, *bssid;u32 pktlen;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; pwlanhdr = (struct ieee80211_hdr *)pframe;
@@ -434,11 +434,11 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u/* 2009.10.15 by tynli. */ static void SetFwRsvdPagePkt (struct adapter *adapt,bool bDLFinished) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;struct xmit_priv *pxmitpriv;struct mlme_ext_priv *pmlmeext; -struct mlme_ext_info *pmlmeinfo; +struct mlme_ext_info *pmlmeinfo;u32 BeaconLength =0 , ProbeRspLength =0 , PSPollLength;u32 NullDataLength, QosNullLength;u8 *ReservedPagePacket;
@@ -543,9 +543,9 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) {struct hal_data_8188e *haldata = adapt->HalData;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -bool bSendBeacon = false; -bool bcn_valid = false; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +bool bSendBeacon = false; +bool bcn_valid = false;u8 DLBcnCount =0 ;u32 poll =0 ;
Signature · 1 line
2.20.1
PATCH 3/6 staging: rtl8188eu: remove blank line between declarations
In reply to Michael StraubeRemove unnecessary blank line between declarations.
--- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +0 -1
@@ -118,7 +118,6 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *pvoid rtw_hal_add_ra_tid (struct adapter *pAdapter,u32 bitmap,u8 arg,u8 rssi_level) {struct odm_dm_struct *odmpriv = &pAdapter->HalData->odmpriv; -u8 macid, init_rate, raid, shortGIrate = false; macid = arg&0x1f ;
Signature · 1 line
2.20.1
PATCH 4/6 staging: rtl8188eu: remove unused function declarations
In reply to Michael StraubeThere are no definitions of odm_DIGbyRSSI_LPS(), ODM_PhyStatusQuery() and ODM_MacStatusQuery() in the driver code. So remove the unused declarations from the headers odm.h and odm_hwconfig.h.
--- drivers/staging/rtl8188eu/include/odm.h | 1 - drivers/staging/rtl8188eu/include/odm_hwconfig.h | 9 --------- 2 files changed, 10 deletions(-)
drivers/staging/rtl8188eu/include/odm.h +0 -1
@@ -1045,7 +1045,6 @@ extern u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8];void ODM_RF_Saving (struct odm_dm_struct *pDM_Odm,u8 bForceInNormal);void ODM_TXPowerTrackingCheck (struct odm_dm_struct *pDM_Odm); -void odm_DIGbyRSSI_LPS (struct odm_dm_struct *pDM_Odm);void ODM_Write_CCK_CCA_Thres (struct odm_dm_struct *pDM_Odm,u8 CurCCK_CCAThres);bool ODM_RAStateCheck (struct odm_dm_struct *pDM_Odm,s32 RSSI ,bool bForceUpdate,u8 *pRATRState);
drivers/staging/rtl8188eu/include/odm_hwconfig.h +0 -9
@@ -93,18 +93,9 @@ struct phy_status_rpt { #endif }; -void odm_Init_RSSIForDM (struct odm_dm_struct *pDM_Odm); -void ODM_PhyStatusQuery (struct odm_dm_struct *pDM_Odm,struct odm_phy_status_info *pPhyInfo,u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo); -void ODM_MacStatusQuery (struct odm_dm_struct *pDM_Odm, -u8 *pMacStatus, -u8 MacID, -bool bPacketMatchBSSID, -bool bPacketToSelf, -bool bPacketBeacon); -#endif
Signature · 1 line
2.20.1
PATCH 5/6 staging: rtl8188eu: add spaces around '*' in rtl8188e_cmd.c
In reply to Michael StraubeAdd spaces around '*' to follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +4 -4
@@ -475,7 +475,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) PageNum += PageNeed; adapt->HalData->FwRsvdPageStartOffset = PageNum; - BufIndex += PageNeed*128 ; + BufIndex += PageNeed *128 ;/* 3 (2) ps-poll *1 page */ RsvdPageLoc.LocPsPoll = PageNum;
@@ -485,7 +485,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) PageNeed = (u8 )PageNum_128 (TxDescLen + PSPollLength); PageNum += PageNeed; - BufIndex += PageNeed*128 ; + BufIndex += PageNeed *128 ;/* 3 (3) null data * 1 page */ RsvdPageLoc.LocNullData = PageNum;
@@ -495,7 +495,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) PageNeed = (u8 )PageNum_128 (TxDescLen + NullDataLength); PageNum += PageNeed; - BufIndex += PageNeed*128 ; + BufIndex += PageNeed *128 ;/* 3 (4) probe response * 1page */ RsvdPageLoc.LocProbeRsp = PageNum;
@@ -505,7 +505,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) PageNeed = (u8 )PageNum_128 (TxDescLen + ProbeRspLength); PageNum += PageNeed; - BufIndex += PageNeed*128 ; + BufIndex += PageNeed *128 ;/* 3 (5) Qos null data */ RsvdPageLoc.LocQosNull = PageNum;
Signature · 1 line
2.20.1
PATCH 6/6 staging: rtl8188eu: cleanup comparsions to NULL in rtl8188eu_xmit.c
In reply to Michael StraubeUse !x instead of x == NULL. Reported by checkpatch.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -2
@@ -440,14 +440,14 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt,RT_TRACE (_module_rtl8192c_xmit_c_, _drv_info_, ("+xmitframe_complete\n" )); pxmitbuf =rtw_alloc_xmitbuf (pxmitpriv); -if (pxmitbuf ==NULL ) +if (!pxmitbuf)return false;/* 3 1. pick up first frame */ rtw_free_xmitframe (pxmitpriv, pxmitframe); pxmitframe =rtw_dequeue_xframe (pxmitpriv, pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); -if (pxmitframe ==NULL ) { +if (!pxmitframe) {/* no more xmit frame, release xmit buffer */ rtw_free_xmitbuf (pxmitpriv, pxmitbuf);return false;
Signature · 1 line
2.20.1