diff options
| author |   Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-07-19 19:27:39 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-22 21:24:15 -0700 |
| commit | 072b3948d473f8c4602b8aa51cec54bcbd0ecddb (patch) | |
| tree | c2fb15c58d3674b34e2342d73c9cf7b9c26e4dcc /drivers/staging | |
| parent | staging: rtl8192e: Rename rtl8192_tx_fill_cmd_desc (diff) | |
| download | linux-dev-072b3948d473f8c4602b8aa51cec54bcbd0ecddb.tar.xz linux-dev-072b3948d473f8c4602b8aa51cec54bcbd0ecddb.zip | |
staging: rtl8192e: Rename rtl8192_tx_fill_desc
Use naming schema found in other rtlwifi devices.
Rename rtl8192_tx_fill_desc to rtl92e_fill_tx_desc.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index bb4a8e62cc95..f511fde62202 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1188,8 +1188,8 @@ static u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc) return tmp_Short; } -void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc, - struct cb_desc *cb_desc, struct sk_buff *skb) +void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, + 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 a848fcda1324..10a16b6935d1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -45,9 +45,8 @@ bool rtl92e_start_adapter(struct net_device *dev); void rtl92e_link_change(struct net_device *dev); void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA, bool WriteIntoReg); -void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc, - struct cb_desc *cb_desc, - struct sk_buff *skb); +void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, + 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, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 298d7bd17513..d7625bac16be 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -48,7 +48,7 @@ static struct rtl819x_ops rtl819xp_ops = { .init_adapter_variable = rtl92e_init_variables, .initialize_adapter = rtl92e_start_adapter, .link_change = rtl92e_link_change, - .tx_fill_descriptor = rtl8192_tx_fill_desc, + .tx_fill_descriptor = rtl92e_fill_tx_desc, .tx_fill_cmd_descriptor = rtl92e_fill_tx_cmd_desc, .rx_query_status_descriptor = rtl92e_get_rx_stats, .rx_command_packet_handler = NULL, |