Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20f896c4 authored by simran singhal's avatar simran singhal Committed by Greg Kroah-Hartman
Browse files

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: default avatarsimran singhal <singhalsimran0@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d0bdcb1

drivers/staging/rtl8192u/ieee80211/ieee80211.h

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;
@@ -167,7 +167,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
Original line number Diff line number Diff line
@@ -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 *s 
		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;

	}