staging: rtl8192u: Fixing no new typedef warning
PATCH 14/15 staging: rtl8192u: Fixing no new typedef warning
This patch fixes following checkpatch.pl
warnings: WARNING:do not add new typedefs.
All the related files have been modified.
Signed-off-by simran singhal <[email protected]>
--- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 ++-- .../staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 4 ++-- .../staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 4 ++-- .../staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 ++-- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 18 +++++++++--------- drivers/staging/rtl8192u/r8192U_core.c | 14 +++++++------- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 4 ++-- drivers/staging/rtl8192u/r819xU_firmware.c | 4 ++-- 10 files changed, 33 insertions(+), 33 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +2 -2
@@ -83,7 +83,7 @@#define SUPPORT_CKIP_PK 0x10 // bit4/* defined for skb cb field */ /* At most 28 byte */ -typedef struct cb_desc { +struct cb_desc {/* Tx Desc Related flags (8-9) */ u8 bLastIniPkt:1 ;u8 bCmdOrInit:1 ;
@@ -139,7 +139,7 @@ typedef struct cb_desc {u8 DrvAggrNum;u16 pkt_size;u8 reserved12; -}cb_desc, *pcb_desc; +};/*--------------------------Define -------------------------------------------*/ #define MGN_1M 0x02
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c +2 -2
@@ -192,7 +192,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)int data_len, i;u8 *pos;struct rtl_80211_hdr_4addr *hdr; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); if (skb_headroom(skb) < CCMP_HDR_LEN || skb_tailroom(skb) < CCMP_MIC_LEN ||
@@ -263,7 +263,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)struct ieee80211_ccmp_data *key = priv;u8 keyidx, *pos;struct rtl_80211_hdr_4addr *hdr; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 pn[6 ];if (skb->len < hdr_len +CCMP_HDR_LEN +CCMP_MIC_LEN ) {
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +2 -2
@@ -304,7 +304,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)int len;u8 *pos;struct rtl_80211_hdr_4addr *hdr; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );int ret =0 ;u8 rc4key[16 ], *icv;u32 crc;
@@ -387,7 +387,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)u32 iv32;u16 iv16;struct rtl_80211_hdr_4addr *hdr; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 rc4key[16 ];u8 icv[4 ];u32 crc;
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +2 -2
@@ -88,7 +88,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)u32 klen, len;u8 key[WEP_KEY_LEN +3 ];u8 *pos; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u32 crc;u8 *icv;struct scatterlist sg;
@@ -166,7 +166,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)u32 klen, plen;u8 key[WEP_KEY_LEN +3 ];u8 keyidx, *pos; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u32 crc;u8 icv[4 ];struct scatterlist sg;
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +2 -2
@@ -345,7 +345,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,return 0 ;if (ieee->hwsec_active) { -cb_desc *tcb_desc = (cb_desc *)(skb->cb+MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+MAX_DEV_ADDR_SIZE ); tcb_desc->bHwSec =1 ; } hdr = (struct rtl_80211_hdr_4addr *) skb->data;
@@ -392,7 +392,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *sreturn 0 ;if (ieee->hwsec_active) { -cb_desc *tcb_desc = (cb_desc *)(skb->cb+MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+MAX_DEV_ADDR_SIZE ); tcb_desc->bHwSec =1 ; }
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
@@ -226,7 +226,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieeestruct rtl_80211_hdr_3addr *header= (struct rtl_80211_hdr_3addr *) skb->data; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +8 ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +8 );spin_lock_irqsave (&ieee->lock, flags);
@@ -2147,7 +2147,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *unsigned int queue_index = txb->queue_index;unsigned long flags;int i; -cb_desc *tcb_desc =NULL ; +struct cb_desc *tcb_desc =NULL ;spin_lock_irqsave (&ieee->lock, flags);
@@ -2157,7 +2157,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device */* update the tx status */ ieee->stats.tx_bytes +=le16_to_cpu (txb->payload_size); ieee->stats.tx_packets++; - tcb_desc = (cb_desc *)(txb->fragments[0 ]->cb +MAX_DEV_ADDR_SIZE ); + tcb_desc = (struct cb_desc *)(txb->fragments[0 ]->cb +MAX_DEV_ADDR_SIZE );if (tcb_desc->bMulticast) { ieee->stats.multicast++; }
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +9 -9
@@ -304,7 +304,7 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)#define SN_LESS (a, b) (((a-b)&0x800)!=0)static void ieee80211_tx_query_agg_cap (struct ieee80211_device *ieee, -struct sk_buff *skb,cb_desc *tcb_desc) +struct sk_buff *skb,struct cb_desc *tcb_desc) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;PTX_TS_RECORD pTxTs =NULL ;
@@ -379,7 +379,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, }static void ieee80211_qurey_ShortPreambleMode (struct ieee80211_device *ieee, -cb_desc *tcb_desc) +struct cb_desc *tcb_desc) { tcb_desc->bUseShortPreamble = false;if (tcb_desc->data_rate ==2 )
@@ -393,7 +393,7 @@ static void ieee80211_qurey_ShortPreambleMode(struct ieee80211_device *ieee,return ; }static void -ieee80211_query_HTCapShortGI (struct ieee80211_device *ieee,cb_desc *tcb_desc) +ieee80211_query_HTCapShortGI (struct ieee80211_device *ieee,struct cb_desc *tcb_desc) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
@@ -415,7 +415,7 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, cb_desc *tcb_desc) }static void ieee80211_query_BandwidthMode (struct ieee80211_device *ieee, -cb_desc *tcb_desc) +struct cb_desc *tcb_desc) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
@@ -436,7 +436,7 @@ static void ieee80211_query_BandwidthMode(struct ieee80211_device *ieee, }static void ieee80211_query_protectionmode (struct ieee80211_device *ieee, -cb_desc *tcb_desc, +struct cb_desc *tcb_desc,struct sk_buff *skb) {// Common Settings
@@ -548,7 +548,7 @@ static void ieee80211_query_protectionmode(struct ieee80211_device *ieee,static void ieee80211_txrate_selectmode (struct ieee80211_device *ieee, -cb_desc *tcb_desc) +struct cb_desc *tcb_desc) {#ifdef TO_DO_LIST if (!IsDataFrame (pFrame))
@@ -615,7 +615,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)struct ieee80211_crypt_data *crypt; -cb_desc *tcb_desc; +struct cb_desc *tcb_desc;spin_lock_irqsave (&ieee->lock, flags);
@@ -766,7 +766,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)for (i =0 ; i < nr_frags; i++) { skb_frag = txb->fragments[i]; - tcb_desc = (cb_desc *)(skb_frag->cb +MAX_DEV_ADDR_SIZE ); + tcb_desc = (struct cb_desc *)(skb_frag->cb +MAX_DEV_ADDR_SIZE );if (qos_actived){ skb_frag->priority = skb->priority;//UP2AC(skb->priority); tcb_desc->queue_index =UP2AC (skb->priority);
@@ -867,7 +867,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)//WB add to fill data tcb_desc here. only first fragment is considered, need to change, and you may remove to other place. if (txb) { -cb_desc *tcb_desc = (cb_desc *)(txb->fragments[0 ]->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(txb->fragments[0 ]->cb +MAX_DEV_ADDR_SIZE ); tcb_desc->bTxEnableFwCalcDur =1 ;if (is_multicast_ether_addr (header.addr1)) tcb_desc->bMulticast =1 ;
drivers/staging/rtl8192u/r8192U_core.c +7 -7
@@ -1009,7 +1009,7 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);int ret;unsigned long flags; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index;/* shall not be referred by command packet */
@@ -1035,7 +1035,7 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv (dev);int ret;unsigned long flags; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index;
@@ -1061,14 +1061,14 @@ static void rtl8192_tx_isr(struct urb *tx_urb)struct sk_buff *skb = (struct sk_buff *)tx_urb->context;struct net_device *dev;struct r8192_priv *priv =NULL ; -cb_desc *tcb_desc; +struct cb_desc *tcb_desc;u8 queue_index;if (!skb)return ; dev = *(struct net_device **)(skb->cb); - tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); + tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); queue_index = tcb_desc->queue_index; priv =ieee80211_priv (dev);
@@ -1285,7 +1285,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)struct urb *tx_urb;unsigned int idx_pipe;tx_desc_cmd_819x_usb *pdesc = (tx_desc_cmd_819x_usb *)skb->data; -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 queue_index = tcb_desc->queue_index;atomic_inc (&priv->tx_pending[queue_index]);
@@ -1477,7 +1477,7 @@ static u8 MRateToHwRate8190Pci(u8 rate) } -static u8 QueryIsShort (u8 TxHT,u8 TxRate,cb_desc *tcb_desc) +static u8 QueryIsShort (u8 TxHT,u8 TxRate,struct cb_desc *tcb_desc) {u8 tmp_Short;
@@ -1503,7 +1503,7 @@ static void tx_zero_isr(struct urb *tx_urb)short rtl8192_tx (struct net_device *dev,struct sk_buff *skb) {struct r8192_priv *priv =ieee80211_priv (dev); -cb_desc *tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); +struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );tx_desc_819x_usb *tx_desc = (tx_desc_819x_usb *)skb->data;tx_fwinfo_819x_usb *tx_fwinfo = (tx_fwinfo_819x_usb *)(skb->data +USB_HWDESC_HEADER_LEN );
drivers/staging/rtl8192u/r819xU_cmdpkt.c +2 -2
@@ -30,7 +30,7 @@ rt_status SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen) {struct r8192_priv *priv =ieee80211_priv (dev);struct sk_buff *skb; -cb_desc *tcb_desc; +struct cb_desc *tcb_desc;unsigned char *ptr_buf;/* Get TCB and local buffer from common pool.
@@ -39,7 +39,7 @@ rt_status SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen)if (!skb)return RT_STATUS_FAILURE ;memcpy ((unsigned char *)(skb->cb), &dev,sizeof (dev)); - tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); + tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); tcb_desc->queue_index =TXCMD_QUEUE ; tcb_desc->bCmdOrInit =DESC_PACKET_TYPE_NORMAL ; tcb_desc->bLastIniPkt =0 ;
drivers/staging/rtl8192u/r819xU_firmware.c +2 -2
@@ -42,7 +42,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,rt_firmware *pfirmware = priv->pFirmware;struct sk_buff *skb;unsigned char *seg_ptr; -cb_desc *tcb_desc; +struct cb_desc *tcb_desc;u8 bLastIniPkt;u8 index;
@@ -67,7 +67,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,if (!skb)return false;memcpy ((unsigned char *)(skb->cb), &dev,sizeof (dev)); - tcb_desc = (cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); + tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); tcb_desc->queue_index =TXCMD_QUEUE ; tcb_desc->bCmdOrInit =DESC_PACKET_TYPE_INIT ; tcb_desc->bLastIniPkt = bLastIniPkt;
Signature · 1 line
2.7.4