drivers: staging: rtl8192u: Fix space required after that ',' errors
PATCH 1/1 drivers: staging: rtl8192u: Fix space required after that ',' errors
Fix checkpatch.pl space required after that ',' errors
Signed-off-by Greg Donald <[email protected]>
--- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 20 ++--- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 92 +++++++++++----------- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 8 +- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 12 +-- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +- drivers/staging/rtl8192u/r8192U_dm.c | 24 +++--- drivers/staging/rtl8192u/r819xU_firmware.c | 6 +- 9 files changed, 86 insertions(+), 86 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +2 -2
@@ -2118,7 +2118,7 @@ struct ieee80211_device {* This function can't sleep. */ void (*softmac_data_hard_start_xmit)(struct sk_buff *skb, -struct net_device *dev,int rate); +struct net_device *dev,int rate);/* stops the HW queue for DATA frames. Useful to avoid * waste time to TX data frame when we are reassociating
@@ -2133,7 +2133,7 @@ struct ieee80211_device {* This function can sleep. the driver should ensure * the radio has been swithced before return. */ -void (*set_chan)(struct net_device *dev,short ch); +void (*set_chan)(struct net_device *dev,short ch);/* These are not used if the ieee stack takes care of * scanning (IEEE_SOFTMAC_SCAN feature set).
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +1 -1
@@ -99,7 +99,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) {struct ieee80211_device *ieee;struct net_device *dev; -int i,err; +int i, err;IEEE80211_DEBUG_INFO ("Initializing...\n" );
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +10 -10
@@ -65,7 +65,7 @@ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,/* Called only as a tasklet (software IRQ) */ static struct ieee80211_frag_entry *ieee80211_frag_cache_find (struct ieee80211_device *ieee,unsigned int seq, -unsigned int frag,u8 tid,u8 *src,u8 *dst) +unsigned int frag,u8 tid,u8 *src,u8 *dst) {struct ieee80211_frag_entry *entry;int i;
@@ -188,7 +188,7 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee, tid =0 ; } - entry =ieee80211_frag_cache_find (ieee, seq,-1 , tid,hdr->addr2, + entry =ieee80211_frag_cache_find (ieee, seq,-1 , tid, hdr->addr2, hdr->addr1);if (entry ==NULL ) {
@@ -767,7 +767,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,static u8 parse_subframe (struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats, -struct ieee80211_rxb *rxb,u8 *src,u8 *dst) +struct ieee80211_rxb *rxb,u8 *src,u8 *dst) {struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)skb->data;u16 fc =le16_to_cpu (hdr->frame_ctl);
@@ -830,7 +830,7 @@ static u8 parse_subframe(struct sk_buff *skb,if (skb->len<(ETHERNET_HEADER_SIZE + nSubframe_Length)) {printk ("%s: A-MSDU parse error!! pRfd->nTotalSubframe : %d\n" ,\ - __func__,rxb->nr_subframes); + __func__, rxb->nr_subframes);printk ("%s: A-MSDU parse error!! Subframe Length: %d\n" ,__func__, nSubframe_Length);printk ("nRemain_Length is %d and nSubframe_Length is : %d\n" ,skb->len,nSubframe_Length);printk ("The Packet SeqNum is %d\n" ,SeqNum);
@@ -849,14 +849,14 @@ static u8 parse_subframe(struct sk_buff *skb, sub_skb =dev_alloc_skb (nSubframe_Length +12 );skb_reserve (sub_skb,12 ); data_ptr = (u8 *)skb_put (sub_skb, nSubframe_Length); -memcpy (data_ptr,skb->data,nSubframe_Length); +memcpy (data_ptr, skb->data, nSubframe_Length);#endif rxb->subframes[rxb->nr_subframes++] = sub_skb;if (rxb->nr_subframes >=MAX_SUBFRAME_COUNT ) {IEEE80211_DEBUG_RX ("ParseSubframe(): Too many Subframes! Packets dropped!\n" );break ; } -skb_pull (skb,nSubframe_Length); +skb_pull (skb, nSubframe_Length);if (skb->len !=0 ) { nPadding_Length =4 - ((nSubframe_Length +ETHERNET_HEADER_SIZE ) %4 );
@@ -868,7 +868,7 @@ static u8 parse_subframe(struct sk_buff *skb,return 0 ; } -skb_pull (skb,nPadding_Length); +skb_pull (skb, nPadding_Length); } }#ifdef JOHN_NOCPY
@@ -1297,7 +1297,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, }/* to parse amsdu packets */ /* qos data packets & reserved bit is 1 */ -if (parse_subframe (skb,rx_stats,rxb,src,dst) ==0 ) { +if (parse_subframe (skb, rx_stats, rxb, src, dst) ==0 ) {/* only to free rxb, and not submit the packets to upper layer */ for (i =0 ; i < rxb->nr_subframes; i++) {dev_kfree_skb (rxb->subframes[i]);
@@ -2384,11 +2384,11 @@ static inline void update_network(struct ieee80211_network *dst,//added by amy for LEAP dst->bWithAironetIE = src->bWithAironetIE; dst->bCkipSupported = src->bCkipSupported; -memcpy (dst->CcxRmState,src->CcxRmState,2 ); +memcpy (dst->CcxRmState, src->CcxRmState,2 ); dst->bCcxRmEnable = src->bCcxRmEnable; dst->MBssidMask = src->MBssidMask; dst->bMBssidValid = src->bMBssidValid; -memcpy (dst->MBssid,src->MBssid,6 ); +memcpy (dst->MBssid, src->MBssid,6 ); dst->bWithCcxVerNum = src->bWithCcxVerNum; dst->BssCcxVerNumber = src->BssCcxVerNumber;
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +46 -46
335 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +4 -4
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(ieee80211_wx_set_wap);int ieee80211_wx_get_essid (struct ieee80211_device *ieee,struct iw_request_info *a,union iwreq_data *wrqu,char *b) { -int len,ret =0 ; +int len, ret =0 ;unsigned long flags;if (ieee->iw_mode ==IW_MODE_MONITOR )
@@ -204,7 +204,7 @@ EXPORT_SYMBOL(ieee80211_wx_set_wap); } len = ieee->current_network.ssid_len; wrqu->essid.length = len; -strncpy (b,ieee->current_network.ssid,len); +strncpy (b, ieee->current_network.ssid, len); wrqu->essid.flags =1 ; out:
@@ -319,7 +319,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) ieee->state =IEEE80211_LINKED_SCANNING ; ieee->link_change (ieee->dev); - ieee->InitialGainHandler (ieee->dev,IG_Backup); + ieee->InitialGainHandler (ieee->dev, IG_Backup);if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { b40M =1 ; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
@@ -341,7 +341,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) ieee->set_chan (ieee->dev, chan); } - ieee->InitialGainHandler (ieee->dev,IG_Restore); + ieee->InitialGainHandler (ieee->dev, IG_Restore); ieee->state =IEEE80211_LINKED ; ieee->link_change (ieee->dev);// To prevent the immediately calling watch_dog after scan.
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +6 -6
@@ -40,12 +40,12 @@ struct modes_unit {int mode_size; };static struct modes_unit ieee80211_modes[] = { - {"a" ,1 }, - {"b" ,1 }, - {"g" ,1 }, - {"?" ,1 }, - {"N-24G" ,5 }, - {"N-5G" ,4 }, + {"a" ,1 }, + {"b" ,1 }, + {"g" ,1 }, + {"?" ,1 }, + {"N-24G" ,5 }, + {"N-5G" ,4 }, };#define iwe_stream_add_event_rsl iwe_stream_add_event
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +2 -2
@@ -165,7 +165,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, Pif (ACT_ADDBAREQ == type) {// BA Start SeqCtrl -memcpy (tag,(u8 *)&(pBA->BaStartSeqCtrl),2 ); +memcpy (tag, (u8 *)&(pBA->BaStartSeqCtrl),2 ); tag +=2 ; }
@@ -564,7 +564,7 @@ OnADDBARsp_Reject:* return: 0(pass), other(fail) * notice: As this function need support of QOS, I comment some code out. And when qos is ready, this code need to be support. ********************************************************************************************************************/ -int ieee80211_rx_DELBA (struct ieee80211_device *ieee,struct sk_buff *skb) +int ieee80211_rx_DELBA (struct ieee80211_device *ieee,struct sk_buff *skb) {struct ieee80211_hdr_3addr *delba =NULL ;PDELBA_PARAM_SET pDelBaParamSet =NULL ;
drivers/staging/rtl8192u/r8192U_dm.c +12 -12
@@ -1474,40 +1474,40 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[0 ] + (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[1 ]<<8 ) ; -rtl8192_setBBreg (dev, rCCK0_TxFilter1,bMaskHWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal);//Write 0xa24 ~ 0xa27 TempVal =0 ; TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[2 ] + (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[3 ]<<8 ) + (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[4 ]<<16 )+ (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[5 ]<<24 ); -rtl8192_setBBreg (dev, rCCK0_TxFilter2,bMaskDWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_TxFilter2, bMaskDWord, TempVal);//Write 0xa28 0xa29 TempVal =0 ; TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[6 ] + (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[7 ]<<8 ) ; -rtl8192_setBBreg (dev, rCCK0_DebugPort,bMaskLWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); }else { TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[0 ] + (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[1 ]<<8 ) ; -rtl8192_setBBreg (dev, rCCK0_TxFilter1,bMaskHWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_TxFilter1, bMaskHWord, TempVal);//Write 0xa24 ~ 0xa27 TempVal =0 ; TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[2 ] + (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[3 ]<<8 ) + (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[4 ]<<16 )+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[5 ]<<24 ); -rtl8192_setBBreg (dev, rCCK0_TxFilter2,bMaskDWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_TxFilter2, bMaskDWord, TempVal);//Write 0xa28 0xa29 TempVal =0 ; TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[6 ] + (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[7 ]<<8 ) ; -rtl8192_setBBreg (dev, rCCK0_DebugPort,bMaskLWord, TempVal); +rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); }
@@ -1570,7 +1570,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH (CCKSwingTable_Ch14[priv->CCK_index][7 ]<<8 ) ;rtl8192_setBBreg (dev, rCCK0_DebugPort, bMaskLWord, TempVal); -RT_TRACE (COMP_POWER_TRACKING ,"CCK chnl 14, reg 0x%x = 0x%x\n" , +RT_TRACE (COMP_POWER_TRACKING ,"CCK chnl 14, reg 0x%x = 0x%x\n" , rCCK0_DebugPort, TempVal); } }
@@ -1601,7 +1601,7 @@ static void dm_txpower_reset_recovery(RT_TRACE (COMP_POWER_TRACKING ,"Reset Recovery: Fill in RFA_txPowerTrackingIndex is %x\n" ,priv->rfa_txpowertrackingindex);RT_TRACE (COMP_POWER_TRACKING ,"Reset Recovery : RF A I/Q Amplify Gain is %ld\n" ,priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbb_iq_amplifygain);RT_TRACE (COMP_POWER_TRACKING ,"Reset Recovery: CCK Attenuation is %d dB\n" ,priv->cck_present_attentuation); -dm_cck_txpower_adjust (dev,priv->bcck_in_ch14); +dm_cck_txpower_adjust (dev, priv->bcck_in_ch14);rtl8192_setBBreg (dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value);RT_TRACE (COMP_POWER_TRACKING ,"Reset Recovery: Fill in 0xc90 is %08x\n" ,priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value);
@@ -2431,7 +2431,7 @@ static void dm_cs_ratio( struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev); -static u8 initialized,force_write; +static u8 initialized, force_write;static u32 reset_cnt;if (dm_digtable.dig_algorithm_switch)
@@ -3134,7 +3134,7 @@ void dm_fsync_timer_callback(unsigned long data) priv->bswitch_fsync = !priv->bswitch_fsync;if (priv->bswitch_fsync) { -write_nic_byte (dev,0xC36 ,0x1c ); +write_nic_byte (dev,0xC36 ,0x1c );write_nic_byte (dev,0xC3e ,0x90 ); }else
@@ -3216,7 +3216,7 @@ static void dm_StartSWFsync(struct net_device *dev)u32 rateIndex;u32 rateBitmap; -RT_TRACE (COMP_HALDM ,"%s\n" , __func__); +RT_TRACE (COMP_HALDM ,"%s\n" , __func__);// Initial rate record to zero, start to record. priv->rate_record =0 ;// Initialize continue diff count to zero, start to record.
@@ -3251,7 +3251,7 @@ static void dm_StartSWFsync(struct net_device *dev)static void dm_EndHWFsync (struct net_device *dev) { -RT_TRACE (COMP_HALDM ,"%s\n" , __func__); +RT_TRACE (COMP_HALDM ,"%s\n" , __func__);write_nic_dword (dev, rOFDM0_RxDetector2,0x465c52cd );write_nic_byte (dev,0xc3b ,0x49 );
drivers/staging/rtl8192u/r819xU_firmware.c +3 -3
@@ -93,7 +93,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,RT_TRACE (COMP_FIRMWARE ,"=====================================================> tx full!\n" );skb_queue_tail (&priv->ieee80211->skb_waitQ[tcb_desc->queue_index], skb); }else { - priv->ieee80211->softmac_hard_start_xmit (skb,dev); + priv->ieee80211->softmac_hard_start_xmit (skb, dev); } code_virtual_address += frag_length;
@@ -257,7 +257,7 @@ bool init_firmware(struct net_device *dev) mapped_file = pfirmware->firmware_buf; file_length = fw_entry->size; }else { -memset (pfirmware->firmware_buf,0 ,128 ); +memset (pfirmware->firmware_buf,0 ,128 );memcpy (&pfirmware->firmware_buf[128 ],fw_entry->data,fw_entry->size); mapped_file = pfirmware->firmware_buf; file_length = fw_entry->size +128 ;
@@ -276,7 +276,7 @@ bool init_firmware(struct net_device *dev)* 3. each skb_buff packet data content will already include the firmware info * and Tx descriptor info * */ - rt_status =fw_download_code (dev,mapped_file,file_length); + rt_status =fw_download_code (dev, mapped_file, file_length);if (rst_opt ==OPT_SYSTEM_RESET )release_firmware (fw_entry);
Signature · 1 line
1.9.1