lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Convert typedef rx_desc to struct rx_desc

Browse Source 
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2011-07-18 22:52:12 -05:00
parent 3215312bc2
commit 4f534b36af
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8192e/r8190P_def.h
View File

@@ -366,7 +366,7 @@ struct tx_desc_cmd {
u32 Reserved6; u32 Reserved6;
};//, *ptx_desc_cmd; };//, *ptx_desc_cmd;
typedef struct _rx_desc_819x_pci{ struct rx_desc {
u16 Length:14; u16 Length:14;
u16 CRC32:1; u16 CRC32:1;
u16 ICV:1; u16 ICV:1;
@@ -385,7 +385,7 @@ typedef struct _rx_desc_819x_pci{
u32 BufferAddress; u32 BufferAddress;
}rx_desc, *prx_desc; };//, *prx_desc;
typedef struct _rx_fwinfo_819x_pci{ typedef struct _rx_fwinfo_819x_pci{

6
drivers/staging/rtl8192e/r8192E_dev.c
View File

@@ -1396,7 +1396,7 @@ rtl8192_signal_scale_mapping(struct r8192_priv * priv,
void rtl8192_query_rxphystatus( void rtl8192_query_rxphystatus(
struct r8192_priv * priv, struct r8192_priv * priv,
struct rtllib_rx_stats * pstats, struct rtllib_rx_stats * pstats,
prx_desc pdesc, struct rx_desc *pdesc,
prx_fwinfo pdrvinfo, prx_fwinfo pdrvinfo,
struct rtllib_rx_stats * precord_stats, struct rtllib_rx_stats * precord_stats,
bool bpacket_match_bssid, 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, void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
struct sk_buff *skb, struct sk_buff *skb,
struct rtllib_rx_stats * pstats, struct rtllib_rx_stats * pstats,
prx_desc pdesc, struct rx_desc *pdesc,
prx_fwinfo pdrvinfo) prx_fwinfo pdrvinfo)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); 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, 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); struct r8192_priv *priv = rtllib_priv(dev);

2
drivers/staging/rtl8192e/r8192E_dev.h
View File

@@ -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, void rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,
cb_desc * cb_desc, struct sk_buff* skb); cb_desc * cb_desc, struct sk_buff* skb);
bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats, 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_halt_adapter(struct net_device *dev, bool reset);
void rtl8192_update_ratr_table(struct net_device* dev); void rtl8192_update_ratr_table(struct net_device* dev);
#endif #endif

6
drivers/staging/rtl8192e/rtl_core.c
View File

@@ -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) short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
rx_desc *entry = NULL; struct rx_desc *entry = NULL;
int i, rx_queue_idx; int i, rx_queue_idx;
for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; 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 ++){ for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){
if (priv->rx_ring[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++) { for (i = 0; i < priv->rxringcount; i++) {
entry = &priv->rx_ring[rx_queue_idx][i]; entry = &priv->rx_ring[rx_queue_idx][i];
entry->OWN = 1; entry->OWN = 1;
@@ -2363,7 +2363,7 @@ void rtl8192_rx_normal(struct net_device *dev)
stats.nic_type = NIC_8192E; stats.nic_type = NIC_8192E;
while (count--) { 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]]; struct sk_buff *skb = priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]];
if (pdesc->OWN) { if (pdesc->OWN) {

6
drivers/staging/rtl8192e/rtl_core.h
View File

@@ -537,8 +537,8 @@ struct rtl819x_ops{
void (*link_change)(struct net_device* dev); 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_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); 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_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, rx_desc *pdesc); 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 (* stop_adapter)(struct net_device *dev, bool reset);
void (* update_ratr_table)(struct net_device* dev); void (* update_ratr_table)(struct net_device* dev);
void (* irq_enable)(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_close)(struct net_device *dev);
void (*rf_init)(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]; struct sk_buff *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT];
dma_addr_t rx_ring_dma[MAX_RX_QUEUE]; dma_addr_t rx_ring_dma[MAX_RX_QUEUE];
unsigned int rx_idx[MAX_RX_QUEUE]; unsigned int rx_idx[MAX_RX_QUEUE];