diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index aa970fc18a21..914046903cfd 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c | |||
@@ -848,8 +848,10 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
848 | _rtl_submit_tx_urb(hw, _urb); | 848 | _rtl_submit_tx_urb(hw, _urb); |
849 | } | 849 | } |
850 | 850 | ||
851 | static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb, | 851 | static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, |
852 | u16 hw_queue) | 852 | struct ieee80211_sta *sta, |
853 | struct sk_buff *skb, | ||
854 | u16 hw_queue) | ||
853 | { | 855 | { |
854 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 856 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
855 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 857 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
@@ -891,7 +893,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
891 | seq_number += 1; | 893 | seq_number += 1; |
892 | seq_number <<= 4; | 894 | seq_number <<= 4; |
893 | } | 895 | } |
894 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc, info, skb, | 896 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc, info, sta, skb, |
895 | hw_queue, &tcb_desc); | 897 | hw_queue, &tcb_desc); |
896 | if (!ieee80211_has_morefrags(hdr->frame_control)) { | 898 | if (!ieee80211_has_morefrags(hdr->frame_control)) { |
897 | if (qc) | 899 | if (qc) |
@@ -901,7 +903,9 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
901 | rtlpriv->cfg->ops->led_control(hw, LED_CTL_TX); | 903 | rtlpriv->cfg->ops->led_control(hw, LED_CTL_TX); |
902 | } | 904 | } |
903 | 905 | ||
904 | static int rtl_usb_tx(struct ieee80211_hw *hw, struct sk_buff *skb, | 906 | static int rtl_usb_tx(struct ieee80211_hw *hw, |
907 | struct ieee80211_sta *sta, | ||
908 | struct sk_buff *skb, | ||
905 | struct rtl_tcb_desc *dummy) | 909 | struct rtl_tcb_desc *dummy) |
906 | { | 910 | { |
907 | struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw)); | 911 | struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw)); |
@@ -913,7 +917,7 @@ static int rtl_usb_tx(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
913 | if (unlikely(is_hal_stop(rtlhal))) | 917 | if (unlikely(is_hal_stop(rtlhal))) |
914 | goto err_free; | 918 | goto err_free; |
915 | hw_queue = rtlusb->usb_mq_to_hwq(fc, skb_get_queue_mapping(skb)); | 919 | hw_queue = rtlusb->usb_mq_to_hwq(fc, skb_get_queue_mapping(skb)); |
916 | _rtl_usb_tx_preprocess(hw, skb, hw_queue); | 920 | _rtl_usb_tx_preprocess(hw, sta, skb, hw_queue); |
917 | _rtl_usb_transmit(hw, skb, hw_queue); | 921 | _rtl_usb_transmit(hw, skb, hw_queue); |
918 | return NETDEV_TX_OK; | 922 | return NETDEV_TX_OK; |
919 | 923 | ||
@@ -923,6 +927,7 @@ err_free: | |||
923 | } | 927 | } |
924 | 928 | ||
925 | static bool rtl_usb_tx_chk_waitq_insert(struct ieee80211_hw *hw, | 929 | static bool rtl_usb_tx_chk_waitq_insert(struct ieee80211_hw *hw, |
930 | struct ieee80211_sta *sta, | ||
926 | struct sk_buff *skb) | 931 | struct sk_buff *skb) |
927 | { | 932 | { |
928 | return false; | 933 | return false; |