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

staging: rtl8192e: Convert typedef tx_desc_cmd to struct tx_desc_cmd

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:38:16 -05:00
parent ececd694df
commit 3215312bc2
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,7 +343,7 @@ struct tx_desc {
};//, *ptx_desc; };//, *ptx_desc;
typedef struct tx_desc_cmd_819x_pci { struct tx_desc_cmd {
u16 PktSize; u16 PktSize;
u8 Reserved1; u8 Reserved1;
u8 CmdType:3; u8 CmdType:3;
@@ -364,7 +364,7 @@ typedef struct tx_desc_cmd_819x_pci {
u32 Reserved4; u32 Reserved4;
u32 Reserved5; u32 Reserved5;
u32 Reserved6; u32 Reserved6;
}tx_desc_cmd, *ptx_desc_cmd; };//, *ptx_desc_cmd;
typedef struct _rx_desc_819x_pci{ typedef struct _rx_desc_819x_pci{
u16 Length:14; u16 Length:14;

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

@@ -1256,7 +1256,7 @@ void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_de
pdesc->TxBuffAddr = cpu_to_le32(mapping); pdesc->TxBuffAddr = cpu_to_le32(mapping);
} }
void rtl8192_tx_fill_cmd_desc(struct net_device* dev, 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)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);

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

@@ -47,7 +47,7 @@ void rtl8192_link_change(struct net_device *dev);
void rtl8192_AllowAllDestAddr(struct net_device* dev, bool bAllowAllDA, bool WriteIntoReg); 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, cb_desc * cb_desc,
struct sk_buff* skb); struct sk_buff* skb);
void rtl8192_tx_fill_cmd_desc(struct net_device* dev, 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); rx_desc *pdesc, struct sk_buff* skb);

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

@@ -2007,7 +2007,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring; struct rtl8192_tx_ring *ring;
tx_desc_cmd* entry; struct tx_desc_cmd * entry;
unsigned int idx; unsigned int idx;
cb_desc *tcb_desc; cb_desc *tcb_desc;
unsigned long flags; unsigned long flags;
@@ -2016,7 +2016,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
ring = &priv->tx_ring[TXCMD_QUEUE]; ring = &priv->tx_ring[TXCMD_QUEUE];
idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries; idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
entry = (tx_desc_cmd*) &ring->desc[idx]; entry = (struct tx_desc_cmd *) &ring->desc[idx];
tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

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

@@ -536,7 +536,7 @@ struct rtl819x_ops{
bool (* initialize_adapter)(struct net_device* dev); bool (* initialize_adapter)(struct net_device* dev);
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, 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, 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, rx_desc *pdesc);
void (* stop_adapter)(struct net_device *dev, bool reset); void (* stop_adapter)(struct net_device *dev, bool reset);