From 4f534b36afb6fe540c151a5bc0b49f15cc208eac Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 22:52:12 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef rx_desc to struct rx_desc Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8190P_def.h | 4 ++-- drivers/staging/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/r8192E_dev.h | 2 +- drivers/staging/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl_core.h | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/r8190P_def.h index a62d34143ffe..228998a4a11c 100644 --- a/drivers/staging/rtl8192e/r8190P_def.h +++ b/drivers/staging/rtl8192e/r8190P_def.h @@ -366,7 +366,7 @@ struct tx_desc_cmd { u32 Reserved6; };//, *ptx_desc_cmd; -typedef struct _rx_desc_819x_pci{ +struct rx_desc { u16 Length:14; u16 CRC32:1; u16 ICV:1; @@ -385,7 +385,7 @@ typedef struct _rx_desc_819x_pci{ u32 BufferAddress; -}rx_desc, *prx_desc; +};//, *prx_desc; typedef struct _rx_fwinfo_819x_pci{ diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 53be813b85fb..41f5add3dd12 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -1396,7 +1396,7 @@ rtl8192_signal_scale_mapping(struct r8192_priv * priv, void rtl8192_query_rxphystatus( struct r8192_priv * priv, struct rtllib_rx_stats * pstats, - prx_desc pdesc, + struct rx_desc *pdesc, prx_fwinfo pdrvinfo, struct rtllib_rx_stats * precord_stats, bool bpacket_match_bssid, @@ -1768,7 +1768,7 @@ void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct rtllib_ void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb, struct rtllib_rx_stats * pstats, - prx_desc pdesc, + struct rx_desc *pdesc, prx_fwinfo pdrvinfo) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); @@ -1871,7 +1871,7 @@ void rtl8192_UpdateReceivedRateHistogramStatistics( } bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats* stats, - rx_desc *pdesc, struct sk_buff* skb) + struct rx_desc *pdesc, struct sk_buff* skb) { struct r8192_priv *priv = rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/r8192E_dev.h index 20652edc49b2..3843c8d1550d 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/r8192E_dev.h @@ -50,7 +50,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); bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats, - rx_desc *pdesc, struct sk_buff* skb); + struct rx_desc *pdesc, struct sk_buff* skb); void rtl8192_halt_adapter(struct net_device *dev, bool reset); void rtl8192_update_ratr_table(struct net_device* dev); #endif diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 7fd8e5d36d3b..321b6856efa3 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -2108,7 +2108,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) short rtl8192_alloc_rx_desc_ring(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - rx_desc *entry = NULL; + struct rx_desc *entry = NULL; int i, rx_queue_idx; for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){ @@ -2210,7 +2210,7 @@ void rtl8192_pci_resetdescring(struct net_device *dev) for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){ if (priv->rx_ring[rx_queue_idx]) { - rx_desc *entry = NULL; + struct rx_desc *entry = NULL; for (i = 0; i < priv->rxringcount; i++) { entry = &priv->rx_ring[rx_queue_idx][i]; entry->OWN = 1; @@ -2363,7 +2363,7 @@ void rtl8192_rx_normal(struct net_device *dev) stats.nic_type = NIC_8192E; while (count--) { - rx_desc *pdesc = &priv->rx_ring[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; + struct rx_desc *pdesc = &priv->rx_ring[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; struct sk_buff *skb = priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; if (pdesc->OWN) { diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h index fdfab03a2cfb..9dc1249a4a4d 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl_core.h @@ -537,8 +537,8 @@ struct rtl819x_ops{ void (*link_change)(struct net_device* dev); void (* tx_fill_descriptor)(struct net_device* dev, struct tx_desc *tx_desc, cb_desc * cb_desc, struct sk_buff *skb); void (* tx_fill_cmd_descriptor)(struct net_device* dev, struct tx_desc_cmd * entry, cb_desc * cb_desc, struct sk_buff *skb); - bool (* rx_query_status_descriptor)(struct net_device* dev, struct rtllib_rx_stats* stats, rx_desc *pdesc, struct sk_buff* skb); - bool (* rx_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, rx_desc *pdesc); + bool (* rx_query_status_descriptor)(struct net_device* dev, struct rtllib_rx_stats* stats, struct rx_desc *pdesc, struct sk_buff* skb); + bool (* rx_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, struct rx_desc *pdesc); void (* stop_adapter)(struct net_device *dev, bool reset); void (* update_ratr_table)(struct net_device* dev); void (* irq_enable)(struct net_device* dev); @@ -644,7 +644,7 @@ typedef struct r8192_priv void (*rf_close)(struct net_device *dev); void (*rf_init)(struct net_device *dev); - rx_desc *rx_ring[MAX_RX_QUEUE]; + struct rx_desc *rx_ring[MAX_RX_QUEUE]; struct sk_buff *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT]; dma_addr_t rx_ring_dma[MAX_RX_QUEUE]; unsigned int rx_idx[MAX_RX_QUEUE]; -- 2.30.2