Commit 3b83db43 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Convert typedef cb_desc to struct cb_desc 



Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 43267fef

drivers/staging/rtl8192e/r8192E_cmdpkt.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
	struct rt_firmware *pfirmware = priv->pFirmware;

	struct sk_buff		*skb;

	unsigned char		*seg_ptr;

	cb_desc			*tcb_desc;

	struct cb_desc *tcb_desc;

	u8				bLastIniPkt;



	struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
@@ -75,7 +75,7 @@ 
		}



		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 = bLastIniPkt;

drivers/staging/rtl8192e/r8192E_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority) 
}





void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_desc * cb_desc, struct sk_buff* skb)

void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc, struct sk_buff* skb)

{

    struct r8192_priv *priv = rtllib_priv(dev);

    dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
@@ -1257,7 +1257,7 @@ void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_de 
}



void  rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,

		cb_desc * cb_desc, struct sk_buff* skb)

		struct cb_desc *cb_desc, struct sk_buff* skb)

{

    struct r8192_priv *priv = rtllib_priv(dev);

    dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
@@ -2265,7 +2265,7 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev) 
	return Reval;

}



u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)

u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)

{

	u8   tmp_Short;

drivers/staging/rtl8192e/r8192E_dev.h

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include "r8190P_def.h"



u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc);

u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc);

bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev);

bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev);

bool rtl8192_HalTxCheckStuck(struct net_device *dev);
@@ -45,10 +45,10 @@ void rtl8192_get_eeprom_size(struct net_device* dev); 
bool rtl8192_adapter_start(struct net_device *dev);

void rtl8192_link_change(struct net_device *dev);

void rtl8192_AllowAllDestAddr(struct net_device* dev, bool bAllowAllDA, bool WriteIntoReg);

void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_desc * cb_desc,

void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc,

		           struct sk_buff* skb);

void  rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,

			       cb_desc * cb_desc, struct sk_buff* skb);

			       struct cb_desc *cb_desc, struct sk_buff* skb);

bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats,

				  struct rx_desc *pdesc, struct sk_buff* skb);

void rtl8192_halt_adapter(struct net_device *dev, bool reset);

drivers/staging/rtl8192e/r8192E_firmware.c

+4 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff 
	struct rt_firmware *pfirmware = priv->pFirmware;

	struct sk_buff	    *skb;

	unsigned char	    *seg_ptr;

	cb_desc		    *tcb_desc;

	struct cb_desc *tcb_desc;

	u8                  bLastIniPkt;



	firmware_init_param(dev);
@@ -60,7 +60,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff 


		skb  = dev_alloc_skb(frag_length + 4);

		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;
@@ -103,14 +103,14 @@ fwSendNullPacket( 
	bool	rtStatus = true;

	struct r8192_priv   *priv = rtllib_priv(dev);

	struct sk_buff	    *skb;

	cb_desc		    *tcb_desc;

	struct cb_desc *tcb_desc;

	unsigned char	    *ptr_buf;

	bool	bLastInitPacket = false;





	skb  = dev_alloc_skb(Length+ 4);

	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 = bLastInitPacket;

drivers/staging/rtl8192e/rtl_core.c

+9 −9
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void rtl8192_prepare_beacon(struct r8192_priv *priv) 
{

	struct net_device *dev = priv->rtllib->dev;

	struct sk_buff *pskb = NULL, *pnewskb = NULL;

	cb_desc *tcb_desc = NULL;

	struct cb_desc *tcb_desc = NULL;

	struct rtl8192_tx_ring *ring = NULL;

	struct tx_desc *pdesc = NULL;
@@ -811,7 +811,7 @@ void rtl8192_prepare_beacon(struct r8192_priv *priv) 
	if (!pnewskb)

		return;



	tcb_desc = (cb_desc *)(pnewskb->cb + 8);

	tcb_desc = (struct cb_desc *)(pnewskb->cb + 8);

	tcb_desc->queue_index = BEACON_QUEUE;

	tcb_desc->data_rate = 2;

	tcb_desc->RATRIndex = 7;
@@ -1425,7 +1425,7 @@ rtl819x_TxCheckStuck(struct net_device *dev) 
	bool			bCheckFwTxCnt = false;

	struct rtl8192_tx_ring  *ring = NULL;

	struct sk_buff* skb = NULL;

	cb_desc * tcb_desc = NULL;

	struct cb_desc * tcb_desc = NULL;

	unsigned long flags = 0;



	switch (priv->rtllib->ps)
@@ -1456,7 +1456,7 @@ rtl819x_TxCheckStuck(struct net_device *dev) 
		else

		{

			skb = (&ring->queue)->next;

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

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

			tcb_desc->nStuckCount++;

			bCheckFwTxCnt = true;

			if (tcb_desc->nStuckCount > 1)
@@ -1911,7 +1911,7 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat 
{

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

	int ret;

	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;



	if ((priv->rtllib->eRFPowerState == eRfOff) || IS_NIC_DOWN(priv) || priv->bResetInProgress){
@@ -1942,7 +1942,7 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) 
{

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

	int ret;

	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;



	if (queue_index != TXCMD_QUEUE){
@@ -2009,7 +2009,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb) 
    struct rtl8192_tx_ring *ring;

    struct tx_desc_cmd * entry;

    unsigned int idx;

    cb_desc *tcb_desc;

    struct cb_desc *tcb_desc;

    unsigned long flags;



    spin_lock_irqsave(&priv->irq_th_lock,flags);
@@ -2018,7 +2018,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb) 
    idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;

    entry = (struct tx_desc_cmd *) &ring->desc[idx];



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

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



    priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb);
@@ -2033,7 +2033,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) 
	struct r8192_priv *priv = rtllib_priv(dev);

	struct rtl8192_tx_ring  *ring;

	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);

	struct tx_desc *pdesc = NULL;

	struct rtllib_hdr_1addr * header = NULL;

	u16 fc=0, type=0,stype=0;