diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 80f75d3ba84a..aad9d44c0a51 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -504,7 +504,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw) | |||
504 | _rtl_update_earlymode_info(hw, skb, | 504 | _rtl_update_earlymode_info(hw, skb, |
505 | &tcb_desc, tid); | 505 | &tcb_desc, tid); |
506 | 506 | ||
507 | rtlpriv->intf_ops->adapter_tx(hw, skb, &tcb_desc); | 507 | rtlpriv->intf_ops->adapter_tx(hw, NULL, skb, &tcb_desc); |
508 | } | 508 | } |
509 | } | 509 | } |
510 | } | 510 | } |
@@ -929,7 +929,7 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw) | |||
929 | info = IEEE80211_SKB_CB(pskb); | 929 | info = IEEE80211_SKB_CB(pskb); |
930 | pdesc = &ring->desc[0]; | 930 | pdesc = &ring->desc[0]; |
931 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *) pdesc, | 931 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *) pdesc, |
932 | info, pskb, BEACON_QUEUE, &tcb_desc); | 932 | info, NULL, pskb, BEACON_QUEUE, &tcb_desc); |
933 | 933 | ||
934 | __skb_queue_tail(&ring->queue, pskb); | 934 | __skb_queue_tail(&ring->queue, pskb); |
935 | 935 | ||
@@ -1305,11 +1305,10 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) | |||
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw, | 1307 | static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw, |
1308 | struct ieee80211_sta *sta, | ||
1308 | struct sk_buff *skb) | 1309 | struct sk_buff *skb) |
1309 | { | 1310 | { |
1310 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1311 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1311 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
1312 | struct ieee80211_sta *sta = info->control.sta; | ||
1313 | struct rtl_sta_info *sta_entry = NULL; | 1312 | struct rtl_sta_info *sta_entry = NULL; |
1314 | u8 tid = rtl_get_tid(skb); | 1313 | u8 tid = rtl_get_tid(skb); |
1315 | 1314 | ||
@@ -1337,13 +1336,14 @@ static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw, | |||
1337 | return true; | 1336 | return true; |
1338 | } | 1337 | } |
1339 | 1338 | ||
1340 | static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb, | 1339 | static int rtl_pci_tx(struct ieee80211_hw *hw, |
1341 | struct rtl_tcb_desc *ptcb_desc) | 1340 | struct ieee80211_sta *sta, |
1341 | struct sk_buff *skb, | ||
1342 | struct rtl_tcb_desc *ptcb_desc) | ||
1342 | { | 1343 | { |
1343 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1344 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1344 | struct rtl_sta_info *sta_entry = NULL; | 1345 | struct rtl_sta_info *sta_entry = NULL; |
1345 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1346 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
1346 | struct ieee80211_sta *sta = info->control.sta; | ||
1347 | struct rtl8192_tx_ring *ring; | 1347 | struct rtl8192_tx_ring *ring; |
1348 | struct rtl_tx_desc *pdesc; | 1348 | struct rtl_tx_desc *pdesc; |
1349 | u8 idx; | 1349 | u8 idx; |
@@ -1418,7 +1418,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1418 | rtlpriv->cfg->ops->led_control(hw, LED_CTL_TX); | 1418 | rtlpriv->cfg->ops->led_control(hw, LED_CTL_TX); |
1419 | 1419 | ||
1420 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc, | 1420 | rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc, |
1421 | info, skb, hw_queue, ptcb_desc); | 1421 | info, sta, skb, hw_queue, ptcb_desc); |
1422 | 1422 | ||
1423 | __skb_queue_tail(&ring->queue, skb); | 1423 | __skb_queue_tail(&ring->queue, skb); |
1424 | 1424 | ||