staging: rtl8723au: Eliminate do_queue_select() functions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index c79d5b90059479edc5b098dfff5de8a55fc43001..00a04af66ff5011131f2455ff091ac69078a24a4 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -1858,18 +1858,6 @@ u32 rtw_get_ff_hwaddr23a(struct xmit_frame *pxmitframe)
        return addr;
 }
 
-static void do_queue_select(struct rtw_adapter *padapter, struct pkt_attrib *pattrib)
-{
-       u8 qsel;
-
-       qsel = pattrib->priority;
-       RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
-                ("### do_queue_select priority =%d , qsel = %d\n",
-                 pattrib->priority, qsel));
-
-       pattrib->qsel = qsel;
-}
-
 /*
  * The main transmit(tx) entry
  *
@@ -1901,7 +1889,7 @@ int rtw_xmit23a(struct rtw_adapter *padapter, struct sk_buff *skb)
        }
        pxmitframe->pkt = skb;
 
-       do_queue_select(padapter, &pxmitframe->attrib);
+       pxmitframe->attrib.qsel = pxmitframe->attrib.priority;
 
 #ifdef CONFIG_8723AU_AP_MODE
        spin_lock_bh(&pxmitpriv->lock);

diff --git a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
index 9cdd9e5d9f769cb53fa6d00d6b665d5f402fcedd..6070510bb470f7575c03220b9adb4dfc1e0ca98a 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
@@ -21,18 +21,6 @@
 /* include <rtl8192c_hal.h> */
 #include <rtl8723a_hal.h>
 
-static void do_queue_select(struct rtw_adapter *padapter, struct pkt_attrib *pattrib)
-{
-       u8 qsel;
-
-       qsel = pattrib->priority;
-       RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
-                ("### do_queue_select priority =%d , qsel = %d\n",
-                 pattrib->priority, qsel));
-
-       pattrib->qsel = qsel;
-}
-
 static int urb_zero_packet_chk(struct rtw_adapter *padapter, int sz)
 {
        int blnSetTxDescOffset;
@@ -441,7 +429,7 @@ bool rtl8723au_hal_xmit(struct rtw_adapter *padapter,
        struct pkt_attrib *pattrib = &pxmitframe->attrib;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       do_queue_select(padapter, pattrib);
+       pattrib->qsel = pattrib->priority;
        spin_lock_bh(&pxmitpriv->lock);
 
 #ifdef CONFIG_8723AU_AP_MODE