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 19:40:00 -0500 |
| commit | 01ffd629b91c25002c30f13d2fdb7a1668aecfe9 (patch) | |
| tree | 1685e77faa813aa813898ecbdfa74177655d1d5e /drivers | |
| parent | 116bf14907dfb75b69350e7351dbd739caa70e2d (diff) | |
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')
| -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) | |||
| 1858 | return addr; | 1858 | return addr; |
| 1859 | } | 1859 | } |
| 1860 | 1860 | ||
| 1861 | static void do_queue_select(struct rtw_adapter *padapter, struct pkt_attrib *pattrib) | ||
| 1862 | { | ||
| 1863 | u8 qsel; | ||
| 1864 | |||
| 1865 | qsel = pattrib->priority; | ||
| 1866 | RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, | ||
| 1867 | ("### do_queue_select priority =%d , qsel = %d\n", | ||
| 1868 | pattrib->priority, qsel)); | ||
| 1869 | |||
| 1870 | pattrib->qsel = qsel; | ||
| 1871 | } | ||
| 1872 | |||
| 1873 | /* | 1861 | /* |
| 1874 | * The main transmit(tx) entry | 1862 | * The main transmit(tx) entry |
| 1875 | * | 1863 | * |
| @@ -1901,7 +1889,7 @@ int rtw_xmit23a(struct rtw_adapter *padapter, struct sk_buff *skb) | |||
| 1901 | } | 1889 | } |
| 1902 | pxmitframe->pkt = skb; | 1890 | pxmitframe->pkt = skb; |
| 1903 | 1891 | ||
| 1904 | do_queue_select(padapter, &pxmitframe->attrib); | 1892 | pxmitframe->attrib.qsel = pxmitframe->attrib.priority; |
| 1905 | 1893 | ||
| 1906 | #ifdef CONFIG_8723AU_AP_MODE | 1894 | #ifdef CONFIG_8723AU_AP_MODE |
| 1907 | spin_lock_bh(&pxmitpriv->lock); | 1895 | 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 @@ | |||
| 21 | /* include <rtl8192c_hal.h> */ | 21 | /* include <rtl8192c_hal.h> */ |
| 22 | #include <rtl8723a_hal.h> | 22 | #include <rtl8723a_hal.h> |
| 23 | 23 | ||
| 24 | static void do_queue_select(struct rtw_adapter *padapter, struct pkt_attrib *pattrib) | ||
| 25 | { | ||
| 26 | u8 qsel; | ||
| 27 | |||
| 28 | qsel = pattrib->priority; | ||
| 29 | RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, | ||
| 30 | ("### do_queue_select priority =%d , qsel = %d\n", | ||
| 31 | pattrib->priority, qsel)); | ||
| 32 | |||
| 33 | pattrib->qsel = qsel; | ||
| 34 | } | ||
| 35 | |||
| 36 | static int urb_zero_packet_chk(struct rtw_adapter *padapter, int sz) | 24 | static int urb_zero_packet_chk(struct rtw_adapter *padapter, int sz) |
| 37 | { | 25 | { |
| 38 | int blnSetTxDescOffset; | 26 | int blnSetTxDescOffset; |
| @@ -441,7 +429,7 @@ bool rtl8723au_hal_xmit(struct rtw_adapter *padapter, | |||
| 441 | struct pkt_attrib *pattrib = &pxmitframe->attrib; | 429 | struct pkt_attrib *pattrib = &pxmitframe->attrib; |
| 442 | struct mlme_priv *pmlmepriv = &padapter->mlmepriv; | 430 | struct mlme_priv *pmlmepriv = &padapter->mlmepriv; |
| 443 | 431 | ||
| 444 | do_queue_select(padapter, pattrib); | 432 | pattrib->qsel = pattrib->priority; |
| 445 | spin_lock_bh(&pxmitpriv->lock); | 433 | spin_lock_bh(&pxmitpriv->lock); |
| 446 | 434 | ||
| 447 | #ifdef CONFIG_8723AU_AP_MODE | 435 | #ifdef CONFIG_8723AU_AP_MODE |
