diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-07-20 18:30:48 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-20 18:30:48 +0200 |
commit | 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 (patch) | |
tree | 9b1d8ca6084012a02b302520bc26e5be65ba7b2a /drivers/net/wireless/rtlwifi/pci.c | |
parent | Merge branch 'net' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/... (diff) | |
parent | libertas: firmware.c: remove duplicated include (diff) | |
download | linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.tar.xz linux-90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 31138fdad1f7..80f75d3ba84a 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -480,7 +480,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw) /* we juse use em for BE/BK/VI/VO */ for (tid = 7; tid >= 0; tid--) { - u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(hw, tid)]; + u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(tid)]; struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue]; while (!mac->act_scanning && rtlpriv->psc.rfpwr_state == ERFON) { |