staging: rtl8192u: fix checkpatch.pl issues to line 2600 staging: rtl8192u: Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 2500
A message that is not in the archive (sent off-list or not yet received): staging:rtl8192U.core-to line3000
PATCH 1/3 staging: rtl8192u: fix checkpatch.pl issues to line 2600 staging: rtl8192u: Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 2500
Signed-off-by Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 57 +++++++++++++++++++------------- 1 files changed, 34 insertions(+), 23 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +34 -23
@@ -2514,27 +2514,31 @@ static struct ieee80211_qos_parameters def_qos_parameters = { }; -void rtl8192_update_beacon (struct work_struct * work) +void rtl8192_update_beacon (struct work_struct *work) { - struct r8192_priv *priv = container_of(work, struct r8192_priv, update_beacon_wq.work); -struct net_device *dev = priv->ieee80211->dev; -struct ieee80211_device * ieee = priv->ieee80211; -struct ieee80211_network * net = &ieee->current_network; + struct r8192_priv *priv = container_of(work, struct r8192_priv, + update_beacon_wq.work); +struct net_device *dev = priv->ieee80211->dev; +struct ieee80211_device *ieee = priv->ieee80211; +struct ieee80211_network *net = &ieee->current_network;if (ieee->pHTInfo->bCurrentHTSupport)HTUpdateSelfAndPeerSetting (ieee, net); - ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bdRT2RTLongSlotTime; + ieee->pHTInfo->bCurrentRT2RTLongSlotTime = + net->bssht.bdRT2RTLongSlotTime;rtl8192_update_cap (dev, net->capability); }/* * background support to run QoS activate functionality */ -int WDCAPARA_ADD [] = {EDCAPARA_BE ,EDCAPARA_BK ,EDCAPARA_VI ,EDCAPARA_VO }; -void rtl8192_qos_activate (struct work_struct * work) +int WDCAPARA_ADD [] = {EDCAPARA_BE ,EDCAPARA_BK ,EDCAPARA_VI ,EDCAPARA_VO }; +void rtl8192_qos_activate (struct work_struct *work) { - struct r8192_priv *priv = container_of(work, struct r8192_priv, qos_activate); +struct r8192_priv *priv =container_of (work, + struct r8192_priv, qos_activate);struct net_device *dev = priv->ieee80211->dev; -struct ieee80211_qos_parameters *qos_parameters = &priv->ieee80211->current_network.qos_data.parameters; +struct ieee80211_qos_parameters *qos_parameters = + &priv->ieee80211->current_network.qos_data.parameters;u8 mode = priv->ieee80211->current_network.mode;/* u32 size = sizeof(struct ieee80211_qos_parameters); */ u8 u1bAIFS;
@@ -2545,19 +2549,25 @@ void rtl8192_qos_activate(struct work_struct * work)return ;mutex_lock (&priv->mutex); -if (priv->ieee80211->state !=IEEE80211_LINKED ) +if (priv->ieee80211->state !=IEEE80211_LINKED ) goto success; -RT_TRACE (COMP_QOS ,"qos active process with associate response received\n" ); +RT_TRACE (COMP_QOS ,"qos active process with associate response" +" received\n" );/* It better set slot time at first */ -/* For we just support b/g mode at present, let the slot time at 9/20 selection */ +/* For we just support b/g mode at present, let the slot time at 9/20 +* selection */ /* update the ac parameter to related registers */ -for (i =0 ; i <QOS_QUEUE_NUM ; i++) { +for (i =0 ; i <QOS_QUEUE_NUM ; i++) {/* Mode G/A: slotTimeTimer = 9; Mode B: 20 */ - u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G |IEEE_N_24G )) ?9 :20 ) + aSifsTime; - u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i]))<<AC_PARAM_TXOP_LIMIT_OFFSET )| - (((u32)(qos_parameters->cw_max[i]))<<AC_PARAM_ECW_MAX_OFFSET )| - (((u32)(qos_parameters->cw_min[i]))<<AC_PARAM_ECW_MIN_OFFSET )| - ((u32 )u1bAIFS <<AC_PARAM_AIFS_OFFSET )); + u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G |IEEE_N_24G )) + ?9 :20 ) + aSifsTime; + u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i])) << +AC_PARAM_TXOP_LIMIT_OFFSET ) | (((u32) + (qos_parameters->cw_max[i])) << +AC_PARAM_ECW_MAX_OFFSET ) | (((u32) + (qos_parameters->cw_min[i])) << +AC_PARAM_ECW_MIN_OFFSET ) | ((u32 )u1bAIFS << +AC_PARAM_AIFS_OFFSET ));write_nic_dword (dev,WDCAPARA_ADD [i], u4bAcParam);/* write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332); */
@@ -2574,7 +2584,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,int ret =0 ;u32 size =sizeof (struct ieee80211_qos_parameters ); -if (priv->ieee80211->state !=IEEE80211_LINKED ) +if (priv->ieee80211->state !=IEEE80211_LINKED )return ret;if ((priv->ieee80211->iw_mode !=IW_MODE_INFRA ))
@@ -2592,16 +2602,17 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, network->qos_data.old_param_count = network->qos_data.param_count;queue_work (priv->priv_wq, &priv->qos_activate); -RT_TRACE (COMP_QOS ,"QoS parameters change call " +RT_TRACE (COMP_QOS ,"QoS parameters change call " "qos_activate\n" ); } }else { -memcpy (&priv->ieee80211->current_network.qos_data.parameters,\ +memcpy (&priv->ieee80211->current_network.qos_data.parameters, &def_qos_parameters, size);if ((network->qos_data.active ==1 ) && (active_network ==1 )) {queue_work (priv->priv_wq, &priv->qos_activate); -RT_TRACE (COMP_QOS ,"QoS was disabled call qos_activate \n" ); +RT_TRACE (COMP_QOS ,"QoS was disabled call qos_activate" +"\n" ); } network->qos_data.active =0 ; network->qos_data.supported =0 ;
Signature · 1 line
1.6.3.3
PATCH 2/3 staging: rtl8192u: fix checkpatch.pl issues to line 2800 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 2800
Signed-off-by Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 69 +++++++++++++++++--------------- 1 files changed, 37 insertions(+), 32 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +37 -32
@@ -2622,13 +2622,13 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, }/* handle manage frame frame beacon and probe response */ -static int rtl8192_handle_beacon (struct net_device * dev, -struct ieee80211_beacon * beacon, -struct ieee80211_network * network) +static int rtl8192_handle_beacon (struct net_device *dev, +struct ieee80211_beacon *beacon, +struct ieee80211_network *network) {struct r8192_priv *priv =ieee80211_priv (dev); -rtl8192_qos_handle_probe_response (priv,1 ,network); +rtl8192_qos_handle_probe_response (priv,1 , network);queue_delayed_work (priv->priv_wq, &priv->update_beacon_wq,0 );return 0 ;
@@ -2650,29 +2650,30 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,if ((priv ==NULL ) || (network ==NULL ))return ret; -if (priv->ieee80211->state !=IEEE80211_LINKED ) +if (priv->ieee80211->state !=IEEE80211_LINKED )return ret;if ((priv->ieee80211->iw_mode !=IW_MODE_INFRA ))return ret;spin_lock_irqsave (&priv->ieee80211->lock, flags); -if (network->flags &NETWORK_HAS_QOS_PARAMETERS ) { -memcpy (&priv->ieee80211->current_network.qos_data.parameters,\ - &network->qos_data.parameters,\ +if (network->flags &NETWORK_HAS_QOS_PARAMETERS ) { +memcpy (&priv->ieee80211->current_network.qos_data.parameters, + &network->qos_data.parameters,sizeof (struct ieee80211_qos_parameters )); priv->ieee80211->current_network.qos_data.active =1 ; { set_qos_param =1 ;/* update qos parameter for current network */ - priv->ieee80211->current_network.qos_data.old_param_count = \ - priv->ieee80211->current_network.qos_data.param_count; - priv->ieee80211->current_network.qos_data.param_count = \ - network->qos_data.param_count; + priv->ieee80211->current_network.qos_data. + old_param_count = priv->ieee80211-> + current_network.qos_data.param_count; + priv->ieee80211->current_network.qos_data.param_count = + network->qos_data.param_count; } }else { -memcpy (&priv->ieee80211->current_network.qos_data.parameters,\ - &def_qos_parameters, size); +memcpy (&priv->ieee80211->current_network.qos_data.parameters, + &def_qos_parameters, size); priv->ieee80211->current_network.qos_data.active =0 ; priv->ieee80211->current_network.qos_data.supported =0 ; set_qos_param =1 ;
@@ -2680,7 +2681,9 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,spin_unlock_irqrestore (&priv->ieee80211->lock, flags); -RT_TRACE (COMP_QOS ,"%s: network->flags = %d,%d\n" ,__func__,network->flags ,priv->ieee80211->current_network.qos_data.active); +RT_TRACE (COMP_QOS ,"%s: network->flags = %d,%d\n" , __func__, + network->flags, priv->ieee80211-> + current_network.qos_data.active);if (set_qos_param ==1 )queue_work (priv->priv_wq, &priv->qos_activate);
@@ -2690,8 +2693,8 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,static int rtl8192_handle_assoc_response (struct net_device *dev, -struct ieee80211_assoc_response_frame *resp, -struct ieee80211_network *network) +struct ieee80211_assoc_response_frame *resp, +struct ieee80211_network *network) {struct r8192_priv *priv =ieee80211_priv (dev);rtl8192_qos_association_resp (priv, network);
@@ -2699,19 +2702,19 @@ static int rtl8192_handle_assoc_response(struct net_device *dev, } -void rtl8192_update_ratr_table (struct net_device * dev) +void rtl8192_update_ratr_table (struct net_device *dev)/* POCTET_STRING posLegacyRate, */ /* u8* pMcsRate) */ /* PRT_WLAN_STA pEntry) */ { -struct r8192_priv * priv =ieee80211_priv (dev); -struct ieee80211_device * ieee = priv->ieee80211; -u8 * pMcsRate = ieee->dot11HTOperationalRateSet; +struct r8192_priv *priv =ieee80211_priv (dev); +struct ieee80211_device *ieee = priv->ieee80211; +u8 *pMcsRate = ieee->dot11HTOperationalRateSet;/* struct ieee80211_network *net = &ieee->current_network; */ u32 ratr_value =0 ;u8 rate_index =0 ; -rtl8192_config_rate (dev, (u16 *)(&ratr_value)); - ratr_value |= (*(u16 *)(pMcsRate)) <<12 ; +rtl8192_config_rate (dev, (u16 *)(&ratr_value)); + ratr_value |= (*(u16 *)(pMcsRate)) <<12 ;/* switch (net->mode) */ switch (ieee->mode) {case IEEE_A :
@@ -2741,7 +2744,7 @@ void rtl8192_update_ratr_table(struct net_device* dev) ratr_value &=0x0FFFFFFF ;if (ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI40MHz) { ratr_value |=0x80000000 ; - }else if (!ieee->pHTInfo->bCurTxBW40MHz && + }else if (!ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI20MHz){ ratr_value |=0x80000000 ; }
@@ -2769,18 +2772,20 @@ bool GetNmodeSupportBySecCfg8192(struct net_device *dev) (0 == strcmp(crypt->ops->name, "WEP")));/* simply judge */ -if (encrypt && (wpa_ie_len ==0 )) { +if (encrypt && (wpa_ie_len ==0 )) {/* wep encryption, no N mode setting */ return false;/* } else if((wpa_ie_len != 0)&&(memcmp(&(ieee->wpa_ie[14]), * ccmp_ie,4))) { */ - }else if ((wpa_ie_len !=0 )) { + }else if ((wpa_ie_len !=0 )) {/* parse pairwise key type */ /* if((pairwisekey = WEP40) || (pairwisekey = WEP104) || * (pairwisekey = TKIP)) */ -if (((ieee->wpa_ie[0 ] ==0xdd ) && (!memcmp (&(ieee->wpa_ie[14 ]),ccmp_ie,4 ))) || ((ieee->wpa_ie[0 ] ==0x30 ) && (!memcmp (&ieee->wpa_ie[10 ],ccmp_rsn_ie,4 )))) +if (((ieee->wpa_ie[0 ] ==0xdd ) && (!memcmp (&(ieee->wpa_ie[14 ]), + ccmp_ie,4 ))) || ((ieee->wpa_ie[0 ] ==0x30 ) && + (!memcmp (&ieee->wpa_ie[10 ], ccmp_rsn_ie,4 ))))return true;else return false;
@@ -2791,13 +2796,13 @@ bool GetNmodeSupportBySecCfg8192(struct net_device *dev)return true; } -bool GetHalfNmodeSupportByAPs819xUsb (struct net_device * dev) +bool GetHalfNmodeSupportByAPs819xUsb (struct net_device *dev) { -bool Reval; -struct r8192_priv * priv =ieee80211_priv (dev); -struct ieee80211_device * ieee = priv->ieee80211; +bool Reval; +struct r8192_priv *priv =ieee80211_priv (dev); +struct ieee80211_device *ieee = priv->ieee80211; -if (ieee->bHalfWirelessN24GMode == true) +if (ieee->bHalfWirelessN24GMode == true) Reval = true;else Reval = false;
Signature · 1 line
1.6.3.3
PATCH 3/3 staging: rtl8192u: fix checkpatch.pl issues to line 3000 Fix most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 3000
Signed-off-by Mike Gilks <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 54 +++++++++++++++++-------------- 1 files changed, 30 insertions(+), 24 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +30 -24
@@ -2810,26 +2810,26 @@ bool GetHalfNmodeSupportByAPs819xUsb(struct net_device *dev)return Reval; } -void rtl8192_refresh_supportrate (struct r8192_priv * priv) +void rtl8192_refresh_supportrate (struct r8192_priv *priv) { -struct ieee80211_device * ieee = priv->ieee80211; +struct ieee80211_device *ieee = priv->ieee80211;/* we donot consider set support rate for ABG mode, * only HT MCS rate is set here. */ -if (ieee->mode ==WIRELESS_MODE_N_24G || ieee->mode ==WIRELESS_MODE_N_5G ) - { -memcpy (ieee->Regdot11HTOperationalRateSet, ieee->RegHTSuppRateSet,16 ); +if (ieee->mode ==WIRELESS_MODE_N_24G || + ieee->mode ==WIRELESS_MODE_N_5G ) { +memcpy (ieee->Regdot11HTOperationalRateSet, + ieee->RegHTSuppRateSet,16 );/* RT_DEBUG_DATA(COMP_INIT, ieee->RegHTSuppRateSet, 16); */ /* RT_DEBUG_DATA(COMP_INIT, * ieee->Regdot11HTOperationalRateSet, 16); */ - } -else + }else memset (ieee->Regdot11HTOperationalRateSet,0 ,16 );return ; } -u8 rtl8192_getSupportedWireleeMode (struct net_device *dev) +u8 rtl8192_getSupportedWireleeMode (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 ret =0 ;
@@ -2876,11 +2876,13 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)/* TODO: this function doesn't work well at this time, * we should wait for FPGA */ -ActUpdateChannelAccessSetting ( pAdapter, pHalData->CurrentWirelessMode, &pAdapter->MgntInfo.Info8185.ChannelAccessSetting ); +ActUpdateChannelAccessSetting (pAdapter, pHalData->CurrentWirelessMode, + &pAdapter->MgntInfo.Info8185.ChannelAccessSetting);#endif priv->ieee80211->mode = wireless_mode; -if ((wireless_mode ==WIRELESS_MODE_N_24G ) || (wireless_mode ==WIRELESS_MODE_N_5G )) +if ((wireless_mode ==WIRELESS_MODE_N_24G ) || + (wireless_mode ==WIRELESS_MODE_N_5G )) priv->ieee80211->pHTInfo->bEnableHT =1 ;else priv->ieee80211->pHTInfo->bEnableHT =0 ;
@@ -2889,7 +2891,7 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device * dev) +static void rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;
@@ -2897,13 +2899,13 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->chan =1 ;/* set to channel 1 */ priv->ieee80211->mode =WIRELESS_MODE_AUTO ;/* SET AUTO */ priv->ieee80211->iw_mode =IW_MODE_INFRA ; - priv->ieee80211->ieee_up=0 ; + priv->ieee80211->ieee_up =0 ; priv->retry_rts =DEFAULT_RETRY_RTS ; priv->retry_data =DEFAULT_RETRY_DATA ; priv->ieee80211->rts =DEFAULT_RTS_THRESHOLD ; priv->ieee80211->rate =110 ;/* 11 mbps */ priv->ieee80211->short_slot =1 ; - priv->promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ; + priv->promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ; priv->CckPwEnl =6 ;/* for silent reset */ priv->IrpPendingCount =1 ;
@@ -2914,7 +2916,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->ieee80211->FwRWRF =0 ;/* we don't use FW read/write RF until stable firmware is available. */ - priv->ieee80211->current_network.beacon_interval =DEFAULT_BEACONINTERVAL ; + priv->ieee80211->current_network.beacon_interval = +DEFAULT_BEACONINTERVAL ; priv->ieee80211->iw_mode =IW_MODE_INFRA ; priv->ieee80211->softmac_features =IEEE_SOFTMAC_SCAN | IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
@@ -2922,7 +2925,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev)IEEE_SOFTMAC_BEACONS ;/* added by amy 080604 | IEEE_SOFTMAC_SINGLE_QUEUE; */ priv->ieee80211->active_scan =1 ; - priv->ieee80211->modulation =IEEE80211_CCK_MODULATION |IEEE80211_OFDM_MODULATION ; + priv->ieee80211->modulation =IEEE80211_CCK_MODULATION | +IEEE80211_OFDM_MODULATION ; priv->ieee80211->host_encrypt =1 ; priv->ieee80211->host_decrypt =1 ; priv->ieee80211->start_send_beacons =NULL ;
@@ -2948,14 +2952,14 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->ieee80211->handle_beacon = rtl8192_handle_beacon;/* added by david */ priv->ieee80211->GetNmodeSupportBySecCfg = GetNmodeSupportBySecCfg8192; - priv->ieee80211->GetHalfNmodeSupportByAPsHandler = GetHalfNmodeSupportByAPs819xUsb; + priv->ieee80211->GetHalfNmodeSupportByAPsHandler = + GetHalfNmodeSupportByAPs819xUsb; priv->ieee80211->SetWirelessMode = rtl8192_SetWirelessMode;/* added by amy */ priv->ieee80211->InitialGainHandler = InitialGain819xUsb; priv->card_type =USB ;#ifdef TO_DO_LIST -if (Adapter->bInHctTest) - { +if (Adapter->bInHctTest) { pHalData->ShortRetryLimit =7 ; pHalData->LongRetryLimit =7 ; }
@@ -2967,7 +2971,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->EarlyRxThreshold =7 ; priv->enable_gpio0 =0 ; priv->TransmitConfig = -/* TCR_DurProcMode | */ +/* TCR_DurProcMode | */ /* for RTL8185B, duration setting by HW */ /* ? TCR_DISReqQsize | */ (TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)|
@@ -2976,12 +2980,12 @@ static void rtl8192_init_priv_variable(struct net_device* dev)/* Short retry limit */ (priv->LongRetryLimit<<TCR_LRL_OFFSET ) |/* Long retry limit */ - (false ?TCR_SAT :0 ); + (false ?TCR_SAT :0 );/* FALSE: HW provies PLCP length and LENGEXT, TURE: * SW proiveds them */ #ifdef TO_DO_LIST -if (Adapter->bInHctTest) +if (Adapter->bInHctTest) pHalData->ReceiveConfig = pHalData->CSMethod | RCR_AMF | RCR_ADF |/* RCR_AAP | */
@@ -3002,17 +3006,19 @@ static void rtl8192_init_priv_variable(struct net_device* dev)/* Max DMA Burst Size per Rx * DMA Burst, 7: unlimited. */ - (pHalData->EarlyRxThreshold<<RCR_FIFO_OFFSET ) | + (pHalData->EarlyRxThreshold << +RCR_FIFO_OFFSET ) |/* Rx FIFO Threshold, 7: * No Rx threshold. */ - (pHalData->EarlyRxThreshold ==7 ? RCR_OnlyErlPkt:0 ); + (pHalData->EarlyRxThreshold == +7 ? RCR_OnlyErlPkt :0 ); else#endif priv->ReceiveConfig =RCR_AMF |RCR_ADF |/* accept management/data */ - RCR_ACF | + RCR_ACF |/* accept control frame for SW AP needs PS-poll, * 2005.07.07, by rcnjko. */
Signature · 1 line
1.6.3.3