summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-18 22:38:16 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-24 01:29:00 -0500
commit3215312bc286dc840c90ce91f29d2628d2019a4f (patch)
tree04cc1ad03b7734ac067df65d804bd7dc16fa1f2a
parentececd694df70a74a329a2958feed1aa8cfd706c5 (diff)
downloadop-kernel-dev-3215312bc286dc840c90ce91f29d2628d2019a4f.zip
op-kernel-dev-3215312bc286dc840c90ce91f29d2628d2019a4f.tar.gz
staging: rtl8192e: Convert typedef tx_desc_cmd to struct tx_desc_cmd
Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-rw-r--r--drivers/staging/rtl8192e/r8190P_def.h4
-rw-r--r--drivers/staging/rtl8192e/r8192E_dev.c2
-rw-r--r--drivers/staging/rtl8192e/r8192E_dev.h2
-rw-r--r--drivers/staging/rtl8192e/rtl_core.c4
-rw-r--r--drivers/staging/rtl8192e/rtl_core.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/r8190P_def.h
index f3b6d71..a62d341 100644
--- a/drivers/staging/rtl8192e/r8190P_def.h
+++ b/drivers/staging/rtl8192e/r8190P_def.h
@@ -343,7 +343,7 @@ struct tx_desc {
};//, *ptx_desc;
-typedef struct tx_desc_cmd_819x_pci {
+struct tx_desc_cmd {
u16 PktSize;
u8 Reserved1;
u8 CmdType:3;
@@ -364,7 +364,7 @@ typedef struct tx_desc_cmd_819x_pci {
u32 Reserved4;
u32 Reserved5;
u32 Reserved6;
-}tx_desc_cmd, *ptx_desc_cmd;
+};//, *ptx_desc_cmd;
typedef struct _rx_desc_819x_pci{
u16 Length:14;
diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index fb42ac2..53be813 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -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);
}
-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)
{
struct r8192_priv *priv = rtllib_priv(dev);
diff --git a/drivers/staging/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/r8192E_dev.h
index 93d9153..20652edc 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/r8192E_dev.h
@@ -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_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_desc * cb_desc,
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);
bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats,
rx_desc *pdesc, struct sk_buff* skb);
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index a44161d..7fd8e5d 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -2007,7 +2007,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{
struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring;
- tx_desc_cmd* entry;
+ struct tx_desc_cmd * entry;
unsigned int idx;
cb_desc *tcb_desc;
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];
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);
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index 63b9e6c..fdfab03 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -536,7 +536,7 @@ struct rtl819x_ops{
bool (* initialize_adapter)(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_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_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, rx_desc *pdesc);
void (* stop_adapter)(struct net_device *dev, bool reset);
OpenPOWER on IntegriCloud