staging: rtl8192e: Rename rtl8192_tx_fill_cmd_desc

Use naming schema found in other rtlwifi devices.
Rename rtl8192_tx_fill_cmd_desc to rtl92e_fill_tx_cmd_desc.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 62fff60..bb4a8e6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1297,9 +1297,8 @@ void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
        pdesc->TxBuffAddr = mapping;
 }
 
-void  rtl8192_tx_fill_cmd_desc(struct net_device *dev,
-                              struct tx_desc_cmd *entry,
-                              struct cb_desc *cb_desc, struct sk_buff *skb)
+void  rtl92e_fill_tx_cmd_desc(struct net_device *dev, struct tx_desc_cmd *entry,
+                             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,

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index 404125e..a848fcd 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
@@ -48,9 +48,8 @@ void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA,
 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,
-                              struct cb_desc *cb_desc, struct sk_buff *skb);
+void  rtl92e_fill_tx_cmd_desc(struct net_device *dev, struct tx_desc_cmd *entry,
+                             struct cb_desc *cb_desc, struct sk_buff *skb);
 bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
                         struct rx_desc *pdesc, struct sk_buff *skb);
 void rtl92e_stop_adapter(struct net_device *dev, bool reset);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index e364f2a..298d7bd 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -49,7 +49,7 @@ static struct rtl819x_ops rtl819xp_ops = {
        .initialize_adapter             = rtl92e_start_adapter,
        .link_change                    = rtl92e_link_change,
        .tx_fill_descriptor             = rtl8192_tx_fill_desc,
-       .tx_fill_cmd_descriptor         = rtl8192_tx_fill_cmd_desc,
+       .tx_fill_cmd_descriptor         = rtl92e_fill_tx_cmd_desc,
        .rx_query_status_descriptor     = rtl92e_get_rx_stats,
        .rx_command_packet_handler = NULL,
        .stop_adapter                   = rtl92e_stop_adapter,