diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-11-30 16:04:57 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:40:00 -0800 |
| commit | 01ffd629b91c25002c30f13d2fdb7a1668aecfe9 (patch) | |
| tree | 1685e77faa813aa813898ecbdfa74177655d1d5e /drivers/staging | |
| parent | 116bf14907dfb75b69350e7351dbd739caa70e2d (diff) | |
| download | linux-stable-01ffd629b91c25002c30f13d2fdb7a1668aecfe9.tar.gz linux-stable-01ffd629b91c25002c30f13d2fdb7a1668aecfe9.tar.bz2 linux-stable-01ffd629b91c25002c30f13d2fdb7a1668aecfe9.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_xmit.c | 14 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c index c79d5b900594..00a04af66ff5 100644 --- 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 9cdd9e5d9f76..6070510bb470 100644 --- 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 |