Commit ec65e266 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: typedef struct tx_fwinfo_819x_usb remove typedef 



Change structure tx_fwinfo_819x_usb from being typedef to being a simple
structure, without the typedef.

Clears the coding style issue flagged by checkpatch, (new type definitions)

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e5fde48

drivers/staging/rtl8192u/r8192U.h

+3 −3
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct tx_desc_cmd_819x_usb { 
	u32	Reserved8;

};



typedef struct _tx_fwinfo_819x_usb {

struct tx_fwinfo_819x_usb {

	/* DOWRD 0 */

	u8	TxRate:7;

	u8	CtsEnable:1;
@@ -271,7 +271,7 @@ typedef struct _tx_fwinfo_819x_usb { 
	u32	TxAGCSign:1;

	u32	Tx_INFO_RSVD:6;

	u32	PacketID:13;

} tx_fwinfo_819x_usb, *ptx_fwinfo_819x_usb;

};



struct rtl8192_rx_info {

	struct urb *urb;
@@ -342,7 +342,7 @@ typedef struct rx_drvinfo_819x_usb { 
#define MAX_802_11_HEADER_LENGTH        (40 + MAX_FIRMWARE_INFORMATION_SIZE)

#define ENCRYPTION_MAX_OVERHEAD		128

#define	USB_HWDESC_HEADER_LEN		sizeof(struct tx_desc_819x_usb)

#define TX_PACKET_SHIFT_BYTES		(USB_HWDESC_HEADER_LEN + sizeof(tx_fwinfo_819x_usb))

#define TX_PACKET_SHIFT_BYTES		(USB_HWDESC_HEADER_LEN + sizeof(struct tx_fwinfo_819x_usb))

#define MAX_FRAGMENT_COUNT		8

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

#define MAX_TRANSMIT_BUFFER_SIZE			32000

drivers/staging/rtl8192u/r8192U_core.c

+5 −5
Original line number Diff line number Diff line
@@ -1463,8 +1463,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	struct r8192_priv *priv = ieee80211_priv(dev);

	struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

	struct tx_desc_819x_usb *tx_desc = (struct tx_desc_819x_usb *)skb->data;

	tx_fwinfo_819x_usb *tx_fwinfo =

		(tx_fwinfo_819x_usb *)(skb->data + USB_HWDESC_HEADER_LEN);

	struct tx_fwinfo_819x_usb *tx_fwinfo =

		(struct tx_fwinfo_819x_usb *)(skb->data + USB_HWDESC_HEADER_LEN);

	struct usb_device *udev = priv->udev;

	int pend;

	int status;
@@ -1489,7 +1489,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	}



	/* Fill Tx firmware info */

	memset(tx_fwinfo, 0, sizeof(tx_fwinfo_819x_usb));

	memset(tx_fwinfo, 0, sizeof(struct tx_fwinfo_819x_usb));

	/* DWORD 0 */

	tx_fwinfo->TxHT = (tcb_desc->data_rate & 0x80) ? 1 : 0;

	tx_fwinfo->TxRate = MRateToHwRate8190Pci(tcb_desc->data_rate);
@@ -1539,7 +1539,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	/* DWORD 0 */

	tx_desc->LINIP = 0;

	tx_desc->CmdInit = 1;

	tx_desc->Offset =  sizeof(tx_fwinfo_819x_usb) + 8;

	tx_desc->Offset =  sizeof(struct tx_fwinfo_819x_usb) + 8;

	tx_desc->PktSize = (skb->len - TX_PACKET_SHIFT_BYTES) & 0xffff;



	/*DWORD 1*/
@@ -1570,7 +1570,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	}



	tx_desc->QueueSelect = MapHwQueueToFirmwareQueue(tcb_desc->queue_index);

	tx_desc->TxFWInfoSize =  sizeof(tx_fwinfo_819x_usb);

	tx_desc->TxFWInfoSize =  sizeof(struct tx_fwinfo_819x_usb);



	tx_desc->DISFB = tcb_desc->bTxDisableRateFallBack;

	tx_desc->USERATE = tcb_desc->bTxUseDriverAssingedRate;

CRA Git | Maintained and supported by SUSTech CRA and CCSE