Commit d59d6f5d authored by Greg Donald's avatar Greg Donald Committed by Greg Kroah-Hartman

staging: rtl8192u: Fix "space prohibited after that open parenthesis '('" errors

Fix checkpatch.pl "space prohibited after that open parenthesis '('" errors
Signed-off-by: default avatarGreg Donald <gdonald@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 422caed9
...@@ -713,8 +713,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, ...@@ -713,8 +713,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
while(!list_empty(&pTS->RxPendingPktList)) { while(!list_empty(&pTS->RxPendingPktList)) {
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__);
pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List); pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
if( SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) || if (SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) ||
SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq))
{ {
/* This protect buffer from overflow. */ /* This protect buffer from overflow. */
if(index >= REORDER_WIN_SIZE) { if(index >= REORDER_WIN_SIZE) {
...@@ -800,9 +800,8 @@ static u8 parse_subframe(struct sk_buff *skb, ...@@ -800,9 +800,8 @@ static u8 parse_subframe(struct sk_buff *skb,
// Null packet, don't indicate it to upper layer // Null packet, don't indicate it to upper layer
ChkLength = LLCOffset;/* + (Frame_WEP(frame)!=0 ?Adapter->MgntInfo.SecurityInfo.EncryptionHeadOverhead:0);*/ ChkLength = LLCOffset;/* + (Frame_WEP(frame)!=0 ?Adapter->MgntInfo.SecurityInfo.EncryptionHeadOverhead:0);*/
if( skb->len <= ChkLength ) { if (skb->len <= ChkLength)
return 0; return 0;
}
skb_pull(skb, LLCOffset); skb_pull(skb, LLCOffset);
...@@ -1035,10 +1034,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -1035,10 +1034,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
{ {
// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->RxLastSeqNum is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->RxLastSeqNum,WLAN_GET_SEQ_SEQ(sc)); // IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->RxLastSeqNum is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->RxLastSeqNum,WLAN_GET_SEQ_SEQ(sc));
if( (fc & (1<<11)) && if ((fc & (1<<11)) &&
(frag == pRxTS->RxLastFragNum) && (frag == pRxTS->RxLastFragNum) &&
(WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum) ) (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) {
{
goto rx_dropped; goto rx_dropped;
} }
else else
...@@ -2456,7 +2454,7 @@ static inline void ieee80211_process_probe_response( ...@@ -2456,7 +2454,7 @@ static inline void ieee80211_process_probe_response(
// then wireless adapter should do active scan from ch1~11 and // then wireless adapter should do active scan from ch1~11 and
// passive scan from ch12~14 // passive scan from ch12~14
if( !IsLegalChannel(ieee, network.channel) ) if (!IsLegalChannel(ieee, network.channel))
return; return;
if(ieee->bGlobalDomain) if(ieee->bGlobalDomain)
{ {
...@@ -2465,8 +2463,7 @@ static inline void ieee80211_process_probe_response( ...@@ -2465,8 +2463,7 @@ static inline void ieee80211_process_probe_response(
// Case 1: Country code // Case 1: Country code
if(IS_COUNTRY_IE_VALID(ieee) ) if(IS_COUNTRY_IE_VALID(ieee) )
{ {
if( !IsLegalChannel(ieee, network.channel) ) if (!IsLegalChannel(ieee, network.channel)) {
{
printk("GetScanInfo(): For Country code, filter probe response at channel(%d).\n", network.channel); printk("GetScanInfo(): For Country code, filter probe response at channel(%d).\n", network.channel);
return; return;
} }
...@@ -2487,8 +2484,7 @@ static inline void ieee80211_process_probe_response( ...@@ -2487,8 +2484,7 @@ static inline void ieee80211_process_probe_response(
// Case 1: Country code // Case 1: Country code
if(IS_COUNTRY_IE_VALID(ieee) ) if(IS_COUNTRY_IE_VALID(ieee) )
{ {
if( !IsLegalChannel(ieee, network.channel) ) if (!IsLegalChannel(ieee, network.channel)) {
{
printk("GetScanInfo(): For Country code, filter beacon at channel(%d).\n",network.channel); printk("GetScanInfo(): For Country code, filter beacon at channel(%d).\n",network.channel);
return; return;
} }
......
...@@ -1043,10 +1043,9 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco ...@@ -1043,10 +1043,9 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
{ {
ccxrm_ie_len = 6+2; ccxrm_ie_len = 6+2;
} }
if( beacon->BssCcxVerNumber >= 2 ) if (beacon->BssCcxVerNumber >= 2)
{
cxvernum_ie_len = 5+2; cxvernum_ie_len = 5+2;
}
#ifdef THOMAS_TURBO #ifdef THOMAS_TURBO
len = sizeof(struct ieee80211_assoc_request_frame)+ 2 len = sizeof(struct ieee80211_assoc_request_frame)+ 2
+ beacon->ssid_len//essid tagged val + beacon->ssid_len//essid tagged val
...@@ -1118,8 +1117,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco ...@@ -1118,8 +1117,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
ieee80211_MFIE_Brate(ieee, &tag); ieee80211_MFIE_Brate(ieee, &tag);
ieee80211_MFIE_Grate(ieee, &tag); ieee80211_MFIE_Grate(ieee, &tag);
// For CCX 1 S13, CKIP. Added by Annie, 2006-08-14. // For CCX 1 S13, CKIP. Added by Annie, 2006-08-14.
if( beacon->bCkipSupported ) if (beacon->bCkipSupported) {
{
static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; // "4500-client" static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; // "4500-client"
u8 CcxAironetBuf[30]; u8 CcxAironetBuf[30];
OCTET_STRING osCcxAironetIE; OCTET_STRING osCcxAironetIE;
...@@ -1158,8 +1156,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco ...@@ -1158,8 +1156,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
tag += osCcxRmCap.Length; tag += osCcxRmCap.Length;
} }
if( beacon->BssCcxVerNumber >= 2 ) if (beacon->BssCcxVerNumber >= 2) {
{
u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00}; u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00};
OCTET_STRING osCcxVerNum; OCTET_STRING osCcxVerNum;
CcxVerNumBuf[4] = beacon->BssCcxVerNumber; CcxVerNumBuf[4] = beacon->BssCcxVerNumber;
......
...@@ -374,7 +374,7 @@ int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info ...@@ -374,7 +374,7 @@ int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info
goto out; goto out;
} }
if ( ieee->state == IEEE80211_LINKED){ if (ieee->state == IEEE80211_LINKED) {
queue_work(ieee->wq, &ieee->wx_sync_scan_wq); queue_work(ieee->wq, &ieee->wx_sync_scan_wq);
/* intentionally forget to up sem */ /* intentionally forget to up sem */
return 0; return 0;
......
...@@ -529,8 +529,7 @@ static void ieee80211_query_protectionmode(struct ieee80211_device *ieee, ...@@ -529,8 +529,7 @@ static void ieee80211_query_protectionmode(struct ieee80211_device *ieee,
} }
} }
// For test , CTS replace with RTS // For test , CTS replace with RTS
if( 0 ) if (0) {
{
tcb_desc->bCTSEnable = true; tcb_desc->bCTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
......
...@@ -342,8 +342,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -342,8 +342,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL; PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL;
PRX_TS_RECORD pTS = NULL; PRX_TS_RECORD pTS = NULL;
if (skb->len < sizeof( struct ieee80211_hdr_3addr) + 9) if (skb->len < sizeof(struct ieee80211_hdr_3addr) + 9) {
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, IEEE80211_DEBUG(IEEE80211_DL_ERR,
" Invalid skb len in BAREQ(%d / %zu)\n", " Invalid skb len in BAREQ(%d / %zu)\n",
skb->len, skb->len,
...@@ -444,8 +443,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -444,8 +443,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
PBA_PARAM_SET pBaParamSet = NULL; PBA_PARAM_SET pBaParamSet = NULL;
u16 ReasonCode; u16 ReasonCode;
if (skb->len < sizeof( struct ieee80211_hdr_3addr) + 9) if (skb->len < sizeof(struct ieee80211_hdr_3addr) + 9) {
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, IEEE80211_DEBUG(IEEE80211_DL_ERR,
" Invalid skb len in BARSP(%d / %zu)\n", " Invalid skb len in BARSP(%d / %zu)\n",
skb->len, skb->len,
...@@ -463,10 +461,9 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -463,10 +461,9 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
// Check the capability // Check the capability
// Since we can always receive A-MPDU, we just check if it is under HT mode. // Since we can always receive A-MPDU, we just check if it is under HT mode.
if( ieee->current_network.qos_data.active == 0 || if (ieee->current_network.qos_data.active == 0 ||
ieee->pHTInfo->bCurrentHTSupport == false || ieee->pHTInfo->bCurrentHTSupport == false ||
ieee->pHTInfo->bCurrentAMPDUEnable == false ) ieee->pHTInfo->bCurrentAMPDUEnable == false) {
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentAMPDUEnable); IEEE80211_DEBUG(IEEE80211_DL_ERR, "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentAMPDUEnable);
ReasonCode = DELBA_REASON_UNKNOWN_BA; ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject; goto OnADDBARsp_Reject;
...@@ -577,8 +574,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -577,8 +574,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
u16 *pReasonCode = NULL; u16 *pReasonCode = NULL;
u8 *dst = NULL; u8 *dst = NULL;
if (skb->len < sizeof( struct ieee80211_hdr_3addr) + 6) if (skb->len < sizeof(struct ieee80211_hdr_3addr) + 6) {
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, IEEE80211_DEBUG(IEEE80211_DL_ERR,
" Invalid skb len in DELBA(%d / %zu)\n", " Invalid skb len in DELBA(%d / %zu)\n",
skb->len, skb->len,
......
...@@ -602,8 +602,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u ...@@ -602,8 +602,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
// TODO: Nedd to take care of this part // TODO: Nedd to take care of this part
IEEE80211_DEBUG(IEEE80211_DL_HT, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n", pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk); IEEE80211_DEBUG(IEEE80211_DL_HT, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n", pCapELE->ChlWidth, pCapELE->MaxAMSDUSize, pCapELE->DssCCk);
if( IsEncrypt) if (IsEncrypt) {
{
pCapELE->MPDUDensity = 7; // 8us pCapELE->MPDUDensity = 7; // 8us
pCapELE->MaxRxAMPDUFactor = 2; // 2 is for 32 K and 3 is 64K pCapELE->MaxRxAMPDUFactor = 2; // 2 is for 32 K and 3 is 64K
} }
...@@ -951,8 +950,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) ...@@ -951,8 +950,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; // For 11n EWC definition, 2007.07.17, by Emily static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33}; // For 11n EWC definition, 2007.07.17, by Emily
static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34}; // For 11n EWC definition, 2007.07.17, by Emily static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34}; // For 11n EWC definition, 2007.07.17, by Emily
if( pHTInfo->bCurrentHTSupport == false ) if (pHTInfo->bCurrentHTSupport == false) {
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, "<=== HTOnAssocRsp(): HT_DISABLE\n"); IEEE80211_DEBUG(IEEE80211_DL_ERR, "<=== HTOnAssocRsp(): HT_DISABLE\n");
return; return;
} }
...@@ -1043,7 +1041,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee) ...@@ -1043,7 +1041,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
// Replace MPDU factor declared in original association response frame format. 2007.08.20 by Emily // Replace MPDU factor declared in original association response frame format. 2007.08.20 by Emily
if (ieee->current_network.bssht.bdRT2RTAggregation) if (ieee->current_network.bssht.bdRT2RTAggregation)
{ {
if( ieee->pairwise_key_type != KEY_TYPE_NA) if (ieee->pairwise_key_type != KEY_TYPE_NA)
// Realtek may set 32k in security mode and 64k for others // Realtek may set 32k in security mode and 64k for others
pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor; pHTInfo->CurrentAMPDUFactor = pPeerHTCap->MaxRxAMPDUFactor;
else else
...@@ -1332,8 +1330,7 @@ u8 HTCCheck(struct ieee80211_device *ieee, u8 *pFrame) ...@@ -1332,8 +1330,7 @@ u8 HTCCheck(struct ieee80211_device *ieee, u8 *pFrame)
{ {
if(ieee->pHTInfo->bCurrentHTSupport) if(ieee->pHTInfo->bCurrentHTSupport)
{ {
if( (IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
{
IEEE80211_DEBUG(IEEE80211_DL_HT, "HT CONTROL FILED EXIST!!\n"); IEEE80211_DEBUG(IEEE80211_DL_HT, "HT CONTROL FILED EXIST!!\n");
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment