tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Jes Sorensen and committed by
Greg Kroah-Hartman 01ffd629 116bf149

+2 -26
+1 -13
drivers/staging/rtl8723au/core/rtw_xmit.c
··· 1858 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 1862 * The main transmit(tx) entry 1875 1863 * ··· 1889 1901 } 1890 1902 pxmitframe->pkt = skb; 1891 1903 1892 - do_queue_select(padapter, &pxmitframe->attrib); 1904 + pxmitframe->attrib.qsel = pxmitframe->attrib.priority; 1893 1905 1894 1906 #ifdef CONFIG_8723AU_AP_MODE 1895 1907 spin_lock_bh(&pxmitpriv->lock);
+1 -13
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
··· 21 21 /* include <rtl8192c_hal.h> */ 22 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 24 static int urb_zero_packet_chk(struct rtw_adapter *padapter, int sz) 37 25 { 38 26 int blnSetTxDescOffset; ··· 429 441 struct pkt_attrib *pattrib = &pxmitframe->attrib; 430 442 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 431 443 432 - do_queue_select(padapter, pattrib); 444 + pattrib->qsel = pattrib->priority; 433 445 spin_lock_bh(&pxmitpriv->lock); 434 446 435 447 #ifdef CONFIG_8723AU_AP_MODE