staging: rtl8192u: coding style fixes in ieee80211
v2 cover staging: rtl8192u: coding style fixes in ieee80211
Addressed some spacing, brace placement, and macro alignment in this driver. I do not have the relevant hardware, but I verified that the drivers/staging/rtl8192u module built between each patch. This time I've included proper patch descriptions, my apologies for the previous series.
Stephen Brennan (3):
staging: rtl8192u: fix OPEN_BRACE errors in ieee80211
staging: rtl8192u: fix macro alignment in ieee80211
staging: rtl8192u: fix spacing in ieee80211
drivers/staging/rtl8192u/ieee80211/dot11d.c | 10 +- .../staging/rtl8192u/ieee80211/ieee80211.h | 38 +++--- .../rtl8192u/ieee80211/ieee80211_crypt.c | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 22 ++-- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 118 ++++++----------- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 14 +- .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 121 ++++++++---------- .../staging/rtl8192u/ieee80211/ieee80211_wx.c | 35 +++-- .../rtl8192u/ieee80211/rtl819x_BAProc.c | 12 +- .../staging/rtl8192u/ieee80211/rtl819x_HT.h | 17 ++- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +- 12 files changed, 174 insertions(+), 233 deletions(-)
Signature · 1 line
2.22.0
PATCH v2 1/3 staging: rtl8192u: fix OPEN_BRACE errors in ieee80211
Checkpatch emits several errors regarding braces being on the incorrect line. These can be fixed by moving the brace, do this. In a few cases, some comments were moved to facilitate this.
--- .../staging/rtl8192u/ieee80211/ieee80211.h | 3 +- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 116 ++++++------------ .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 81 +++++------- .../staging/rtl8192u/ieee80211/ieee80211_wx.c | 3 +- .../staging/rtl8192u/ieee80211/rtl819x_HT.h | 3 +- 5 files changed, 73 insertions(+), 133 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +1 -2
@@ -458,8 +458,7 @@ do { if (ieee80211_debug_level & (level)) \int i; \u8 *pdata = (u8 *) data; \printk (KERN_DEBUG "ieee80211: %s()\n" , __func__); \ -for (i =0 ; i < (int )(datalen); i++) \ - { \ +for (i =0 ; i < (int )(datalen); i++) { \printk ("%2x " , pdata[i]); \if ((i +1 ) %16 ==0 )printk ("\n" ); \ } \
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +40 -76
291 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +30 -51
182 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +1 -2
@@ -130,8 +130,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee, max_rate = rate; } -if (network->mode >=IEEE_N_24G )//add N rate here; - { +if (network->mode >=IEEE_N_24G )/* add N rate here */ {struct ht_capability_ele *ht_cap =NULL ;bool is40M = false, isShortGI = false;u8 max_mcs =0 ;
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +1 -2
@@ -273,8 +273,7 @@ typedef enum _HT_AGGRE_SIZE { }HT_AGGRE_SIZE_E , *PHT_AGGRE_SIZE_E ;/* Indicate different AP vendor for IOT issue */ -typedef enum _HT_IOT_PEER -{ +typedef enum _HT_IOT_PEER { HT_IOT_PEER_UNKNOWN = 0, HT_IOT_PEER_REALTEK = 1, HT_IOT_PEER_BROADCOM = 2,
Signature · 1 line
2.22.0
PATCH v2 2/3 staging: rtl8192u: fix macro alignment in ieee80211
In reply to Stephen BrennanSeveral macros display unaligned, due to mixes of tabs and spaces. These can be fixed by making spacing consistent, do this.
--- .../staging/rtl8192u/ieee80211/ieee80211.h | 35 ++++++++++--------- .../staging/rtl8192u/ieee80211/rtl819x_HT.h | 8 ++--- 2 files changed, 22 insertions(+), 21 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +18 -17
@@ -169,9 +169,9 @@ struct cb_desc {#define MGN_MCS14 0x8e#define MGN_MCS15 0x8f -#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \ +#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \ priv->ieee80211->current_network.mode == IEEE_N_24G || \ - priv->ieee80211->current_network.mode == IEEE_N_5G) ? \ + priv->ieee80211->current_network.mode == IEEE_N_5G) ? \ 16 : 10)#define MGMT_QUEUE_NUM 5
@@ -387,7 +387,7 @@ struct ieee_param {#define IEEE80211_STYPE_ACK 0x00D0#define IEEE80211_STYPE_CFEND 0x00E0#define IEEE80211_STYPE_CFENDACK 0x00F0 -#define IEEE80211_STYPE_BLOCKACK 0x0094 +#define IEEE80211_STYPE_BLOCKACK 0x0094/* data */ #define IEEE80211_STYPE_DATA 0x0000
@@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \ printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)//wb added to debug out data buf //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA -#define IEEE80211_DEBUG_DATA (level, data, datalen) \ - do { if ((ieee80211_debug_level & (level)) == (level)) \ - { \ - int i; \ - u8 *pdata = (u8 *) data; \ - printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ - for (i = 0; i < (int)(datalen); i++) { \ - printk("%2x ", pdata[i]); \ - if ((i + 1) % 16 == 0) printk("\n"); \ - } \ - printk("\n"); \ - } \ +#define IEEE80211_DEBUG_DATA (level, data, datalen) \ + do { if ((ieee80211_debug_level & (level)) == (level)) \ + { \ + int i; \ + u8 *pdata = (u8 *) data; \ + printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ + for (i = 0; i < (int)(datalen); i++) { \ + printk("%2x ", pdata[i]); \ + if ((i + 1) % 16 == 0) \ + printk("\n"); \ + } \ + printk("\n"); \ + } \ } while (0)#else #define IEEE80211_DEBUG (level, fmt, args...) do {} while (0)
@@ -2014,8 +2015,8 @@ struct ieee80211_device {#define IEEE_A (1<<0)#define IEEE_B (1<<1)#define IEEE_G (1<<2) -#define IEEE_N_24G (1<<4) -#define IEEE_N_5G (1<<5) +#define IEEE_N_24G (1<<4) +#define IEEE_N_5G (1<<5)#define IEEE_MODE_MASK (IEEE_A | IEEE_B | IEEE_G)/* Generate a 802.11 header */
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +4 -4
@@ -253,10 +253,10 @@ extern u8 MCS_FILTER_1SS[16];/* 2007/07/12 MH We only define legacy and HT wireless mode now. */ #define LEGACY_WIRELESS_MODE IEEE_MODE_MASK -#define CURRENT_RATE (WirelessMode, LegacyRate, HTRate) \ - ((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ?\ - (LegacyRate) :\ - (PICK_RATE(LegacyRate, HTRate)) +#define CURRENT_RATE (WirelessMode, LegacyRate, HTRate) \ + ((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \ + (LegacyRate) : \ + (PICK_RATE(LegacyRate, HTRate))// MCS Bw 40 {1~7, 12~15,32} #define RATE_ADPT_1SS_MASK 0xFF
Signature · 1 line
2.22.0
Re: [PATCH v2 2/3] staging: rtl8192u: fix macro alignment in ieee80211
Quoted 2 lines · Stephen Brennan
Several macros display unaligned, due to mixes of tabs and spaces. These can be fixed by making spacing consistent, do this.
[]
Quoted 18 lines
drivers/staging/rtl8192u/ieee80211/ieee80211.h +2
-12@@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \ printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)//wb added to debug out data buf //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA -#define IEEE80211_DEBUG_DATA (level, data, datalen) \ - do { if ((ieee80211_debug_level & (level)) == (level)) \ - { \ - int i; \ - u8 *pdata = (u8 *) data; \ - printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ - for (i = 0; i < (int)(datalen); i++) { \ - printk("%2x ", pdata[i]); \ - if ((i + 1) % 16 == 0) printk("\n"); \ - } \ - printk("\n"); \ - } \ +#define IEEE80211_DEBUG_DATA (level, data, datalen) \ + do { if ((ieee80211_debug_level & (level)) == (level)) \
drivers/staging/rtl8192u/ieee80211/ieee80211.h do { if (ieee80211_debug_level & (level)) \ · line 466
Quoted 10 lines
drivers/staging/rtl8192u/ieee80211/ieee80211.h +10
-0+ { \ +int i; \ +u8 *pdata = (u8 *) data; \ +printk (KERN_DEBUG "ieee80211: %s()\n" , __func__); \ +for (i =0 ; i < (int )(datalen); i++) { \ +printk ("%2x " , pdata[i]); \ +if ((i +1 ) %16 ==0 ) \ +printk ("\n" ); \ + } \ +printk ("\n" ); \
without pr_cont/KERN_CONT, this will output a terrible mess.
It's probably better to use print_hex_dump_debug
PATCH v2 3/3 staging: rtl8192u: fix spacing in ieee80211
In reply to Stephen BrennanCheckpatch emits several errors, warnings, and checks about spacing. Apply checkpatch's suggested spacing rules.
--- drivers/staging/rtl8192u/ieee80211/dot11d.c | 10 ++-- .../staging/rtl8192u/ieee80211/ieee80211.h | 4 +- .../rtl8192u/ieee80211/ieee80211_crypt.c | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 22 ++++---- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 14 +++--- .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 50 +++++++++---------- .../staging/rtl8192u/ieee80211/ieee80211_wx.c | 32 ++++++------ .../rtl8192u/ieee80211/rtl819x_BAProc.c | 12 ++--- .../staging/rtl8192u/ieee80211/rtl819x_HT.h | 6 +-- .../rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +++--- 12 files changed, 86 insertions(+), 86 deletions(-)
drivers/staging/rtl8192u/ieee80211/dot11d.c +5 -5
@@ -12,7 +12,7 @@ void rtl8192u_dot11d_init(struct ieee80211_device *ieee) dot11d_info->state =DOT11D_STATE_NONE ; dot11d_info->country_ie_len =0 ;memset (dot11d_info->channel_map,0 ,MAX_CHANNEL_NUMBER +1 ); -memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 ); +memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 );RESET_CIE_WATCHDOG (ieee);netdev_info (ieee->dev,"rtl8192u_dot11d_init()\n" );
@@ -25,8 +25,8 @@ void dot11d_reset(struct ieee80211_device *ieee)u32 i;struct rt_dot11d_info *dot11d_info =GET_DOT11D_INFO (ieee);/* Clear old channel map */ -memset (dot11d_info->channel_map,0 ,MAX_CHANNEL_NUMBER +1 ); -memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 ); +memset (dot11d_info->channel_map,0 ,MAX_CHANNEL_NUMBER +1 ); +memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 );/* Set new channel map */ for (i =1 ; i <=11 ; i++) (dot11d_info->channel_map)[i] =1 ;
@@ -56,8 +56,8 @@ void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,u8 i, j, NumTriples, MaxChnlNum;struct chnl_txpower_triple *pTriple; -memset (dot11d_info->channel_map,0 ,MAX_CHANNEL_NUMBER +1 ); -memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 ); +memset (dot11d_info->channel_map,0 ,MAX_CHANNEL_NUMBER +1 ); +memset (dot11d_info->max_tx_pwr_dbm_list,0xFF ,MAX_CHANNEL_NUMBER +1 ); MaxChnlNum =0 ; NumTriples = (CoutryIeLen -3 ) /3 ;/* skip 3-byte country string. */ pTriple = (struct chnl_txpower_triple *)(pCoutryIe +3 );
drivers/staging/rtl8192u/ieee80211/ieee80211.h +2 -2
@@ -456,7 +456,7 @@ do { if (ieee80211_debug_level & (level)) \ do { if ((ieee80211_debug_level & (level)) == (level)) \ { \ int i; \ - u8 *pdata = (u8 *) data; \ + u8 *pdata = (u8 *)data; \ printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ for (i = 0; i < (int)(datalen); i++) { \ printk("%2x ", pdata[i]); \
@@ -468,7 +468,7 @@ do { if (ieee80211_debug_level & (level)) \ } while (0)#else #define IEEE80211_DEBUG (level, fmt, args...) do {} while (0) -#define IEEE80211_DEBUG_DATA (level, data, datalen) do {} while(0) +#define IEEE80211_DEBUG_DATA (level, data, datalen) do {} while (0)#endif /* CONFIG_IEEE80211_DEBUG */ /* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c +1 -1
@@ -176,7 +176,7 @@ struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name) } -static void *ieee80211_crypt_null_init (int keyidx) {return (void *)1 ; } +static void *ieee80211_crypt_null_init (int keyidx) {return (void *)1 ; }static void ieee80211_crypt_null_deinit (void *priv) {}static struct ieee80211_crypto_ops ieee80211_crypt_null = {
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +11 -11
@@ -160,7 +160,7 @@ static inline u16 Hi16(u32 val)static inline u16 Mk16 (u8 hi,u8 lo) { -return lo | (((u16 ) hi) <<8 ); +return lo | (((u16 )hi) <<8 ); }static const u16 Sbox[256 ] = {
@@ -238,7 +238,7 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,* Make temporary area overlap WEP seed so that the final copy can be * avoided on little endian hosts. */ -u16 *PPK = (u16 *) &WEPSeed[4 ]; +u16 *PPK = (u16 *)&WEPSeed[4 ];/* Step 1 - make copy of TTAK and bring in TSC */ PPK [0 ] =TTAK [0 ];
@@ -299,7 +299,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) skb->len < hdr_len)return -1 ; - hdr = (struct rtl_80211_hdr_4addr *) skb->data; + hdr = (struct rtl_80211_hdr_4addr *)skb->data;if (!tcb_desc->bHwSec) {if (!tkey->tx_phase1_done) {
@@ -343,7 +343,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[2 ] = crc >>16 ; icv[3 ] = crc >>24 ;crypto_sync_skcipher_setkey (tkey->tx_tfm_arc4, rc4key,16 ); -sg_init_one (&sg, pos, len+4 ); +sg_init_one (&sg, pos, len +4 );skcipher_request_set_sync_tfm (req, tkey->tx_tfm_arc4);skcipher_request_set_callback (req,0 ,NULL ,NULL );skcipher_request_set_crypt (req, &sg, &sg, len +4 ,NULL );
@@ -383,7 +383,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)if (skb->len < hdr_len +8 +4 )return -1 ; - hdr = (struct rtl_80211_hdr_4addr *) skb->data; + hdr = (struct rtl_80211_hdr_4addr *)skb->data; pos = skb->data + hdr_len; keyidx = pos[3 ];if (!(keyidx &BIT (5 ))) {
@@ -435,7 +435,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -12 ;crypto_sync_skcipher_setkey (tkey->rx_tfm_arc4, rc4key,16 ); -sg_init_one (&sg, pos, plen+4 ); +sg_init_one (&sg, pos, plen +4 );skcipher_request_set_sync_tfm (req, tkey->rx_tfm_arc4);skcipher_request_set_callback (req,0 ,NULL ,NULL );
@@ -523,7 +523,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr) {struct rtl_80211_hdr_4addr *hdr11; - hdr11 = (struct rtl_80211_hdr_4addr *) skb->data; + hdr11 = (struct rtl_80211_hdr_4addr *)skb->data;switch (le16_to_cpu (hdr11->frame_ctl) & (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS )) {case IEEE80211_FCTL_TODS :
@@ -556,7 +556,7 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priu8 *pos;struct rtl_80211_hdr_4addr *hdr; - hdr = (struct rtl_80211_hdr_4addr *) skb->data; + hdr = (struct rtl_80211_hdr_4addr *)skb->data;if (skb_tailroom (skb) <8 || skb->len < hdr_len) { printk(KERN_DEBUG "Invalid packet for Michael MIC add "
@@ -599,7 +599,7 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,memcpy (ev.src_addr.sa_data, hdr->addr2,ETH_ALEN );memset (&wrqu,0 ,sizeof (wrqu)); wrqu.data.length =sizeof (ev); -wireless_send_event (dev,IWEVMICHAELMICFAILURE , &wrqu, (char *) &ev); +wireless_send_event (dev,IWEVMICHAELMICFAILURE , &wrqu, (char *)&ev); } static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
@@ -609,7 +609,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,u8 mic[8 ];struct rtl_80211_hdr_4addr *hdr; - hdr = (struct rtl_80211_hdr_4addr *) skb->data; + hdr = (struct rtl_80211_hdr_4addr *)skb->data;if (!tkey->key_set)return -1 ;
@@ -626,7 +626,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,return -1 ;if (memcmp (mic, skb->data + skb->len -8 ,8 ) !=0 ) {struct rtl_80211_hdr_4addr *hdr; - hdr = (struct rtl_80211_hdr_4addr *) skb->data; + hdr = (struct rtl_80211_hdr_4addr *)skb->data; printk(KERN_DEBUG "%s: Michael MIC verification failed for " "MSDU from %pM keyidx=%d\n",
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +2 -2
@@ -135,7 +135,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_sync_skcipher_setkey (wep->tx_tfm, key, klen); -sg_init_one (&sg, pos, len+4 ); +sg_init_one (&sg, pos, len +4 );skcipher_request_set_sync_tfm (req, wep->tx_tfm);skcipher_request_set_callback (req,0 ,NULL ,NULL );
@@ -192,7 +192,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)SYNC_SKCIPHER_REQUEST_ON_STACK (req, wep->rx_tfm);crypto_sync_skcipher_setkey (wep->rx_tfm, key, klen); -sg_init_one (&sg, pos, plen+4 ); +sg_init_one (&sg, pos, plen +4 );skcipher_request_set_sync_tfm (req, wep->rx_tfm);skcipher_request_set_callback (req,0 ,NULL ,NULL );
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +1 -1
@@ -1237,7 +1237,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, && !is_multicast_ether_addr(hdr->addr1)) {TID =Frame_QoSTID (skb->data); SeqNum =WLAN_GET_SEQ_SEQ (sc); -GetTs (ieee, (struct ts_common_info **) &pTS, hdr->addr2,TID ,RX_DIR , true); +GetTs (ieee, (struct ts_common_info **)&pTS, hdr->addr2,TID ,RX_DIR , true);if (TID !=0 &&TID !=3 ) { ieee->bis_any_nonbepkts = true; }
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +7 -7
@@ -42,8 +42,8 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info/* if setting by freq convert to channel */ if (fwrq->e ==1 ) { -if ((fwrq->m >= (int )2.412e8 && - fwrq->m <= (int )2.487e8 )) { +if ((fwrq->m >= (int )2.412e8 && + fwrq->m <= (int )2.487e8 )) {int f = fwrq->m /100000 ;int c =0 ;
@@ -92,7 +92,7 @@ int ieee80211_wx_get_freq(struct ieee80211_device *ieee,if (ieee->current_network.channel ==0 )return -1 ;/* NM 0.7.0 will not accept channel any more. */ - fwrq->m = ieee80211_wlan_frequencies[ieee->current_network.channel-1 ] *100000 ; + fwrq->m = ieee80211_wlan_frequencies[ieee->current_network.channel -1 ] *100000 ; fwrq->e =1 ;/* fwrq->m = ieee->current_network.channel; */ /* fwrq->e = 0; */
@@ -220,7 +220,7 @@ int ieee80211_wx_set_rate(struct ieee80211_device *ieee,u32 target_rate = wrqu->bitrate.value; - ieee->rate = target_rate/100000 ; + ieee->rate = target_rate /100000 ;/* FIXME: we might want to limit rate also in management protocols. */ return 0 ; }
@@ -415,9 +415,9 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,if (wrqu->essid.flags && wrqu->essid.length) {/* first flush current network.ssid */ - len = ((wrqu->essid.length-1 ) <IW_ESSID_MAX_SIZE ) ? (wrqu->essid.length-1 ) :IW_ESSID_MAX_SIZE ; -strncpy (ieee->current_network.ssid, extra, len+1 ); - ieee->current_network.ssid_len = len+1 ; + len = ((wrqu->essid.length -1 ) <IW_ESSID_MAX_SIZE ) ? (wrqu->essid.length -1 ) :IW_ESSID_MAX_SIZE ; +strncpy (ieee->current_network.ssid, extra, len +1 ); + ieee->current_network.ssid_len = len +1 ; ieee->ssid_set =1 ; }else { ieee->ssid_set =0 ;
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +25 -25
166 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +16 -16
@@ -70,10 +70,10 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee, }/* Add the protocol name */ iwe.cmd =SIOCGIWNAME ; -for (i=0 ; i<ARRAY_SIZE (ieee80211_modes); i++) { +for (i =0 ; i <ARRAY_SIZE (ieee80211_modes); i++) {if (network->mode &BIT (i)) { -sprintf (pname,ieee80211_modes[i].mode_string,ieee80211_modes[i].mode_size); - pname +=ieee80211_modes[i].mode_size; +sprintf (pname, ieee80211_modes[i].mode_string, ieee80211_modes[i].mode_size); + pname += ieee80211_modes[i].mode_size; } } *pname ='\0' ;
@@ -138,13 +138,13 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee, ht_cap = (struct ht_capability_ele *)&network->bssht.bdHTCapBuf[4 ]; else ht_cap = (struct ht_capability_ele *)&network->bssht.bdHTCapBuf[0 ]; - is40M = (ht_cap->ChlWidth)?1 :0 ; - isShortGI = (ht_cap->ChlWidth)? - ((ht_cap->ShortGI40Mhz)?1 :0 ): - ((ht_cap->ShortGI20Mhz)?1 :0 ); + is40M = (ht_cap->ChlWidth) ?1 :0 ; + isShortGI = (ht_cap->ChlWidth) ? + ((ht_cap->ShortGI40Mhz) ?1 :0 ) : + ((ht_cap->ShortGI20Mhz) ?1 :0 ); max_mcs =HTGetHighestMCSRate (ieee, ht_cap->MCS,MCS_FILTER_ALL ); - rate =MCS_DATA_RATE [is40M][isShortGI][max_mcs&0x7f ]; + rate =MCS_DATA_RATE [is40M][isShortGI][max_mcs &0x7f ];if (rate > max_rate) max_rate = rate; }
@@ -242,7 +242,7 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,list_for_each_entry (network, &ieee->network_list, list) { i++; -if ((stop-ev)<200 ) { +if ((stop - ev) <200 ) { err = -E2BIG ;break ; }
@@ -453,7 +453,7 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,IEEE80211_DEBUG_WX ("GET_ENCODE\n" ); -if (ieee->iw_mode ==IW_MODE_MONITOR ) +if (ieee->iw_mode ==IW_MODE_MONITOR )return -1 ; key = erq->flags &IW_ENCODE_INDEX ;
@@ -570,7 +570,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, ret = -EINVAL ; goto done; } -printk ("alg name:%s\n" ,alg); +printk ("alg name:%s\n" , alg); ops =try_then_request_module (ieee80211_get_crypto_ops (alg), module);if (!ops) {
@@ -687,7 +687,7 @@ int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee, ext->key_len =0 ; encoding->flags |=IW_ENCODE_DISABLED ; }else { -if (strcmp (crypt->ops->name,"WEP" ) ==0 ) +if (strcmp (crypt->ops->name,"WEP" ) ==0 ) ext->alg =IW_ENCODE_ALG_WEP ;else if (strcmp (crypt->ops->name,"TKIP" )) ext->alg =IW_ENCODE_ALG_TKIP ;
@@ -711,7 +711,7 @@ int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - struct iw_mlme *mlme = (struct iw_mlme *) extra; + struct iw_mlme *mlme = (struct iw_mlme *)extra;switch (mlme->cmd) {case IW_MLME_DEAUTH :case IW_MLME_DISASSOC :
@@ -764,7 +764,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,break ;case IW_AUTH_WPA_ENABLED : - ieee->wpa_enabled = (data->value)?1 :0 ; + ieee->wpa_enabled = (data->value) ?1 :0 ;break ;case IW_AUTH_RX_UNENCRYPTED_EAPOL :
@@ -784,14 +784,14 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) {u8 *buf; -if (len>MAX_WPA_IE_LEN || (len && !ie)) { +if (len >MAX_WPA_IE_LEN || (len && !ie)) {// printk("return error out, len:%d\n", len); return -EINVAL ; }if (len) { -if (len != ie[1 ]+2 ) { +if (len != ie[1 ] +2 ) {printk ("len:%zu, ie:%d\n" , len, ie[1 ]);return -EINVAL ; }
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +6 -6
@@ -162,7 +162,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, s tag +=2 ; } -IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); +IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len);return skb;//return NULL; }
@@ -229,7 +229,7 @@ static struct sk_buff *ieee80211_DELBA(put_unaligned_le16 (ReasonCode, tag); tag +=2 ; -IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); +IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len);if (net_ratelimit ())IEEE80211_DEBUG (IEEE80211_DL_TRACE |IEEE80211_DL_BA ,"<=====%s()\n" , __func__);
@@ -331,9 +331,9 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)return -1 ; } -IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); +IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); - req = (struct rtl_80211_hdr_3addr *) skb->data; + req = (struct rtl_80211_hdr_3addr *)skb->data; tag = (u8 *)req; dst = &req->addr2[0 ]; tag +=sizeof (struct rtl_80211_hdr_3addr );
@@ -556,7 +556,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)return -1 ; } -IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); +IEEE80211_DEBUG_DATA (IEEE80211_DL_DATA |IEEE80211_DL_BA , skb->data, skb->len); delba = (struct rtl_80211_hdr_3addr *)skb->data; dst = &delba->addr2[0 ]; pDelBaParamSet = (union delba_param_set *)&delba->payload[2 ];
@@ -643,7 +643,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,ieee80211_send_DELBA ( ieee, pTsCommonInfo->addr, - (pTxTs->tx_admitted_ba_record.valid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record), + (pTxTs->tx_admitted_ba_record.valid) ? (&pTxTs->tx_admitted_ba_record) : (&pTxTs->tx_pending_ba_record), TxRxSelect,DELBA_REASON_END_BA ); }else if (TxRxSelect ==RX_DIR ) {
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +3 -3
@@ -270,7 +270,7 @@ typedef enum _HT_AGGRE_SIZE {HT_AGG_SIZE_16K =1 ,HT_AGG_SIZE_32K =2 ,HT_AGG_SIZE_64K =3 , -}HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E; +} HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E;/* Indicate different AP vendor for IOT issue */ typedef enum _HT_IOT_PEER {
@@ -281,7 +281,7 @@ typedef enum _HT_IOT_PEER {HT_IOT_PEER_ATHEROS =4 ,HT_IOT_PEER_CISCO =5 , HT_IOT_PEER_MAX = 6 -}HT_IOT_PEER_E , *PHTIOT_PEER_E ; +}HT_IOT_PEER_E , *PHTIOT_PEER_E ;/* * IOT Action for different AP
@@ -297,6 +297,6 @@ typedef enum _HT_IOT_ACTION {HT_IOT_ACT_CDD_FSYNC =0x00000080 ,HT_IOT_ACT_PURE_N_MODE =0x00000100 ,HT_IOT_ACT_FORCED_CTS2SELF =0x00000200 , -}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; +} HT_IOT_ACTION_E, *PHT_IOT_ACTION_E;#endif //_RTL819XU_HTTYPE_H_
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +7 -7
@@ -105,7 +105,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) {eth_zero_addr (pTsCommonInfo->addr);memset (&pTsCommonInfo->t_spec,0 ,sizeof (struct tspec_body )); -memset (&pTsCommonInfo->t_class,0 ,sizeof (union qos_tclas )*TCLAS_NUM ); +memset (&pTsCommonInfo->t_class,0 ,sizeof (union qos_tclas ) *TCLAS_NUM ); pTsCommonInfo->t_clas_proc =0 ; pTsCommonInfo->t_clas_num =0 ; }
@@ -183,9 +183,9 @@ void TSInitialize(struct ieee80211_device *ieee)//#ifdef TO_DO_LIST for (count =0 ; count <REORDER_ENTRY_NUM ; count++) {list_add_tail (&pRxReorderEntry->List, &ieee->RxReorder_Unused_List); -if (count == (REORDER_ENTRY_NUM -1 )) +if (count == (REORDER_ENTRY_NUM -1 ))break ; - pRxReorderEntry = &ieee->RxReorderEntry[count+1 ]; + pRxReorderEntry = &ieee->RxReorderEntry[count +1 ]; }//#endif }
@@ -259,7 +259,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee, }if (&pRet->list != psearch_list) -return pRet ; +return pRet;else return NULL ; }
@@ -367,8 +367,8 @@ bool GetTs( (&ieee->Rx_TS_Admit_List);enum direction_value Dir = (ieee->iw_mode ==IW_MODE_MASTER ) ? - ((TxRxSelect ==TX_DIR )?DIR_DOWN :DIR_UP ) : - ((TxRxSelect ==TX_DIR )?DIR_UP :DIR_DOWN ); + ((TxRxSelect ==TX_DIR ) ?DIR_DOWN :DIR_UP ) : + ((TxRxSelect ==TX_DIR ) ?DIR_UP :DIR_DOWN );IEEE80211_DEBUG (IEEE80211_DL_TS ,"to add Ts\n" );if (!list_empty (pUnusedList)) { (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);
@@ -530,7 +530,7 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx jiffies + msecs_to_jiffies(TS_ADDBA_DELAY)); }else {IEEE80211_DEBUG (IEEE80211_DL_BA ,"%s: Immediately Start ADDBA now!!\n" , __func__); -mod_timer (&pTxTS->ts_add_ba_timer, jiffies+10 );//set 10 ticks +mod_timer (&pTxTS->ts_add_ba_timer, jiffies +10 );//set 10 ticks } }else {IEEE80211_DEBUG (IEEE80211_DL_ERR ,"%s()==>BA timer is already added\n" , __func__);
Signature · 1 line
2.22.0