diff options
Diffstat (limited to 'drivers/net')
49 files changed, 207 insertions, 122 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 689a71c1af71..154a4965be4f 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -1661,7 +1661,9 @@ static void adm8211_tx_raw(struct ieee80211_hw *dev, struct sk_buff *skb, | |||
1661 | } | 1661 | } |
1662 | 1662 | ||
1663 | /* Put adm8211_tx_hdr on skb and transmit */ | 1663 | /* Put adm8211_tx_hdr on skb and transmit */ |
1664 | static void adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | 1664 | static void adm8211_tx(struct ieee80211_hw *dev, |
1665 | struct ieee80211_tx_control *control, | ||
1666 | struct sk_buff *skb) | ||
1665 | { | 1667 | { |
1666 | struct adm8211_tx_hdr *txhdr; | 1668 | struct adm8211_tx_hdr *txhdr; |
1667 | size_t payload_len, hdrlen; | 1669 | size_t payload_len, hdrlen; |
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index efc162e0b511..abb520dec032 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c | |||
@@ -1726,7 +1726,9 @@ static void at76_mac80211_tx_callback(struct urb *urb) | |||
1726 | ieee80211_wake_queues(priv->hw); | 1726 | ieee80211_wake_queues(priv->hw); |
1727 | } | 1727 | } |
1728 | 1728 | ||
1729 | static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 1729 | static void at76_mac80211_tx(struct ieee80211_hw *hw, |
1730 | struct ieee80211_tx_control *control, | ||
1731 | struct sk_buff *skb) | ||
1730 | { | 1732 | { |
1731 | struct at76_priv *priv = hw->priv; | 1733 | struct at76_priv *priv = hw->priv; |
1732 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; | 1734 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; |
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c index 260e7dc7f751..934f04c1cb9d 100644 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c | |||
@@ -55,7 +55,8 @@ | |||
55 | \********************/ | 55 | \********************/ |
56 | 56 | ||
57 | static void | 57 | static void |
58 | ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 58 | ath5k_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, |
59 | struct sk_buff *skb) | ||
59 | { | 60 | { |
60 | struct ath5k_hw *ah = hw->priv; | 61 | struct ath5k_hw *ah = hw->priv; |
61 | u16 qnum = skb_get_queue_mapping(skb); | 62 | u16 qnum = skb_get_queue_mapping(skb); |
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index b09285c36c4a..7373e4b92c92 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -280,6 +280,7 @@ struct ath_tx_control { | |||
280 | struct ath_txq *txq; | 280 | struct ath_txq *txq; |
281 | struct ath_node *an; | 281 | struct ath_node *an; |
282 | u8 paprd; | 282 | u8 paprd; |
283 | struct ieee80211_sta *sta; | ||
283 | }; | 284 | }; |
284 | 285 | ||
285 | #define ATH_TX_ERROR 0x01 | 286 | #define ATH_TX_ERROR 0x01 |
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 936e920fb88e..b30596fcf73a 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -542,6 +542,7 @@ void ath9k_htc_stop_ani(struct ath9k_htc_priv *priv); | |||
542 | 542 | ||
543 | int ath9k_tx_init(struct ath9k_htc_priv *priv); | 543 | int ath9k_tx_init(struct ath9k_htc_priv *priv); |
544 | int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, | 544 | int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, |
545 | struct ieee80211_sta *sta, | ||
545 | struct sk_buff *skb, u8 slot, bool is_cab); | 546 | struct sk_buff *skb, u8 slot, bool is_cab); |
546 | void ath9k_tx_cleanup(struct ath9k_htc_priv *priv); | 547 | void ath9k_tx_cleanup(struct ath9k_htc_priv *priv); |
547 | bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype); | 548 | bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype); |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index 77d541feb910..f42d2eb6af99 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | |||
@@ -326,7 +326,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv, | |||
326 | goto next; | 326 | goto next; |
327 | } | 327 | } |
328 | 328 | ||
329 | ret = ath9k_htc_tx_start(priv, skb, tx_slot, true); | 329 | ret = ath9k_htc_tx_start(priv, NULL, skb, tx_slot, true); |
330 | if (ret != 0) { | 330 | if (ret != 0) { |
331 | ath9k_htc_tx_clear_slot(priv, tx_slot); | 331 | ath9k_htc_tx_clear_slot(priv, tx_slot); |
332 | dev_kfree_skb_any(skb); | 332 | dev_kfree_skb_any(skb); |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index c785129692ff..8a0ccf70aa14 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -856,7 +856,9 @@ set_timer: | |||
856 | /* mac80211 Callbacks */ | 856 | /* mac80211 Callbacks */ |
857 | /**********************/ | 857 | /**********************/ |
858 | 858 | ||
859 | static void ath9k_htc_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 859 | static void ath9k_htc_tx(struct ieee80211_hw *hw, |
860 | struct ieee80211_tx_control *control, | ||
861 | struct sk_buff *skb) | ||
860 | { | 862 | { |
861 | struct ieee80211_hdr *hdr; | 863 | struct ieee80211_hdr *hdr; |
862 | struct ath9k_htc_priv *priv = hw->priv; | 864 | struct ath9k_htc_priv *priv = hw->priv; |
@@ -883,7 +885,7 @@ static void ath9k_htc_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
883 | goto fail_tx; | 885 | goto fail_tx; |
884 | } | 886 | } |
885 | 887 | ||
886 | ret = ath9k_htc_tx_start(priv, skb, slot, false); | 888 | ret = ath9k_htc_tx_start(priv, control->sta, skb, slot, false); |
887 | if (ret != 0) { | 889 | if (ret != 0) { |
888 | ath_dbg(common, XMIT, "Tx failed\n"); | 890 | ath_dbg(common, XMIT, "Tx failed\n"); |
889 | goto clear_slot; | 891 | goto clear_slot; |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index 47e61d0da33b..06cdcb772d78 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | |||
@@ -333,12 +333,12 @@ static void ath9k_htc_tx_data(struct ath9k_htc_priv *priv, | |||
333 | } | 333 | } |
334 | 334 | ||
335 | int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, | 335 | int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, |
336 | struct ieee80211_sta *sta, | ||
336 | struct sk_buff *skb, | 337 | struct sk_buff *skb, |
337 | u8 slot, bool is_cab) | 338 | u8 slot, bool is_cab) |
338 | { | 339 | { |
339 | struct ieee80211_hdr *hdr; | 340 | struct ieee80211_hdr *hdr; |
340 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 341 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
341 | struct ieee80211_sta *sta = tx_info->control.sta; | ||
342 | struct ieee80211_vif *vif = tx_info->control.vif; | 342 | struct ieee80211_vif *vif = tx_info->control.vif; |
343 | struct ath9k_htc_sta *ista; | 343 | struct ath9k_htc_sta *ista; |
344 | struct ath9k_htc_vif *avp = NULL; | 344 | struct ath9k_htc_vif *avp = NULL; |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 6049d8b82855..4d8dc9ff5a75 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -694,7 +694,9 @@ mutex_unlock: | |||
694 | return r; | 694 | return r; |
695 | } | 695 | } |
696 | 696 | ||
697 | static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 697 | static void ath9k_tx(struct ieee80211_hw *hw, |
698 | struct ieee80211_tx_control *control, | ||
699 | struct sk_buff *skb) | ||
698 | { | 700 | { |
699 | struct ath_softc *sc = hw->priv; | 701 | struct ath_softc *sc = hw->priv; |
700 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); | 702 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); |
@@ -754,6 +756,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
754 | 756 | ||
755 | memset(&txctl, 0, sizeof(struct ath_tx_control)); | 757 | memset(&txctl, 0, sizeof(struct ath_tx_control)); |
756 | txctl.txq = sc->tx.txq_map[skb_get_queue_mapping(skb)]; | 758 | txctl.txq = sc->tx.txq_map[skb_get_queue_mapping(skb)]; |
759 | txctl.sta = control->sta; | ||
757 | 760 | ||
758 | ath_dbg(common, XMIT, "transmitting packet, skb: %p\n", skb); | 761 | ath_dbg(common, XMIT, "transmitting packet, skb: %p\n", skb); |
759 | 762 | ||
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 2c9da6b2ecb1..ef91f6cc2d79 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1773,11 +1773,12 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, | |||
1773 | TX_STAT_INC(txq->axq_qnum, queued); | 1773 | TX_STAT_INC(txq->axq_qnum, queued); |
1774 | } | 1774 | } |
1775 | 1775 | ||
1776 | static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb, | 1776 | static void setup_frame_info(struct ieee80211_hw *hw, |
1777 | struct ieee80211_sta *sta, | ||
1778 | struct sk_buff *skb, | ||
1777 | int framelen) | 1779 | int framelen) |
1778 | { | 1780 | { |
1779 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 1781 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
1780 | struct ieee80211_sta *sta = tx_info->control.sta; | ||
1781 | struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; | 1782 | struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; |
1782 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 1783 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
1783 | const struct ieee80211_rate *rate; | 1784 | const struct ieee80211_rate *rate; |
@@ -1935,7 +1936,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1935 | { | 1936 | { |
1936 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 1937 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
1937 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1938 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
1938 | struct ieee80211_sta *sta = info->control.sta; | 1939 | struct ieee80211_sta *sta = txctl->sta; |
1939 | struct ieee80211_vif *vif = info->control.vif; | 1940 | struct ieee80211_vif *vif = info->control.vif; |
1940 | struct ath_softc *sc = hw->priv; | 1941 | struct ath_softc *sc = hw->priv; |
1941 | struct ath_txq *txq = txctl->txq; | 1942 | struct ath_txq *txq = txctl->txq; |
@@ -1979,7 +1980,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1979 | !ieee80211_is_data(hdr->frame_control)) | 1980 | !ieee80211_is_data(hdr->frame_control)) |
1980 | info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; | 1981 | info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; |
1981 | 1982 | ||
1982 | setup_frame_info(hw, skb, frmlen); | 1983 | setup_frame_info(hw, sta, skb, frmlen); |
1983 | 1984 | ||
1984 | /* | 1985 | /* |
1985 | * At this point, the vif, hw_key and sta pointers in the tx control | 1986 | * At this point, the vif, hw_key and sta pointers in the tx control |
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 376be11161c0..8f0cbc35816f 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h | |||
@@ -577,7 +577,9 @@ void carl9170_rx(struct ar9170 *ar, void *buf, unsigned int len); | |||
577 | void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len); | 577 | void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len); |
578 | 578 | ||
579 | /* TX */ | 579 | /* TX */ |
580 | void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); | 580 | void carl9170_op_tx(struct ieee80211_hw *hw, |
581 | struct ieee80211_tx_control *control, | ||
582 | struct sk_buff *skb); | ||
581 | void carl9170_tx_janitor(struct work_struct *work); | 583 | void carl9170_tx_janitor(struct work_struct *work); |
582 | void carl9170_tx_process_status(struct ar9170 *ar, | 584 | void carl9170_tx_process_status(struct ar9170 *ar, |
583 | const struct carl9170_rsp *cmd); | 585 | const struct carl9170_rsp *cmd); |
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c index 6a8681407a1d..84377cf580e0 100644 --- a/drivers/net/wireless/ath/carl9170/tx.c +++ b/drivers/net/wireless/ath/carl9170/tx.c | |||
@@ -867,14 +867,15 @@ static bool carl9170_tx_cts_check(struct ar9170 *ar, | |||
867 | return false; | 867 | return false; |
868 | } | 868 | } |
869 | 869 | ||
870 | static int carl9170_tx_prepare(struct ar9170 *ar, struct sk_buff *skb) | 870 | static int carl9170_tx_prepare(struct ar9170 *ar, |
871 | struct ieee80211_sta *sta, | ||
872 | struct sk_buff *skb) | ||
871 | { | 873 | { |
872 | struct ieee80211_hdr *hdr; | 874 | struct ieee80211_hdr *hdr; |
873 | struct _carl9170_tx_superframe *txc; | 875 | struct _carl9170_tx_superframe *txc; |
874 | struct carl9170_vif_info *cvif; | 876 | struct carl9170_vif_info *cvif; |
875 | struct ieee80211_tx_info *info; | 877 | struct ieee80211_tx_info *info; |
876 | struct ieee80211_tx_rate *txrate; | 878 | struct ieee80211_tx_rate *txrate; |
877 | struct ieee80211_sta *sta; | ||
878 | struct carl9170_tx_info *arinfo; | 879 | struct carl9170_tx_info *arinfo; |
879 | unsigned int hw_queue; | 880 | unsigned int hw_queue; |
880 | int i; | 881 | int i; |
@@ -910,8 +911,6 @@ static int carl9170_tx_prepare(struct ar9170 *ar, struct sk_buff *skb) | |||
910 | else | 911 | else |
911 | cvif = NULL; | 912 | cvif = NULL; |
912 | 913 | ||
913 | sta = info->control.sta; | ||
914 | |||
915 | txc = (void *)skb_push(skb, sizeof(*txc)); | 914 | txc = (void *)skb_push(skb, sizeof(*txc)); |
916 | memset(txc, 0, sizeof(*txc)); | 915 | memset(txc, 0, sizeof(*txc)); |
917 | 916 | ||
@@ -1457,20 +1456,21 @@ err_unlock_rcu: | |||
1457 | return false; | 1456 | return false; |
1458 | } | 1457 | } |
1459 | 1458 | ||
1460 | void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 1459 | void carl9170_op_tx(struct ieee80211_hw *hw, |
1460 | struct ieee80211_tx_control *control, | ||
1461 | struct sk_buff *skb) | ||
1461 | { | 1462 | { |
1462 | struct ar9170 *ar = hw->priv; | 1463 | struct ar9170 *ar = hw->priv; |
1463 | struct ieee80211_tx_info *info; | 1464 | struct ieee80211_tx_info *info; |
1464 | struct ieee80211_sta *sta; | 1465 | struct ieee80211_sta *sta = control->sta; |
1465 | bool run; | 1466 | bool run; |
1466 | 1467 | ||
1467 | if (unlikely(!IS_STARTED(ar))) | 1468 | if (unlikely(!IS_STARTED(ar))) |
1468 | goto err_free; | 1469 | goto err_free; |
1469 | 1470 | ||
1470 | info = IEEE80211_SKB_CB(skb); | 1471 | info = IEEE80211_SKB_CB(skb); |
1471 | sta = info->control.sta; | ||
1472 | 1472 | ||
1473 | if (unlikely(carl9170_tx_prepare(ar, skb))) | 1473 | if (unlikely(carl9170_tx_prepare(ar, sta, skb))) |
1474 | goto err_free; | 1474 | goto err_free; |
1475 | 1475 | ||
1476 | carl9170_tx_accounting(ar, skb); | 1476 | carl9170_tx_accounting(ar, skb); |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index b80352b308d5..2ca4e885f5ff 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -3407,7 +3407,8 @@ static void b43_tx_work(struct work_struct *work) | |||
3407 | } | 3407 | } |
3408 | 3408 | ||
3409 | static void b43_op_tx(struct ieee80211_hw *hw, | 3409 | static void b43_op_tx(struct ieee80211_hw *hw, |
3410 | struct sk_buff *skb) | 3410 | struct ieee80211_tx_control *control, |
3411 | struct sk_buff *skb) | ||
3411 | { | 3412 | { |
3412 | struct b43_wl *wl = hw_to_b43_wl(hw); | 3413 | struct b43_wl *wl = hw_to_b43_wl(hw); |
3413 | 3414 | ||
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 8156135a0590..74d4c20cc31b 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -2492,6 +2492,7 @@ static void b43legacy_tx_work(struct work_struct *work) | |||
2492 | } | 2492 | } |
2493 | 2493 | ||
2494 | static void b43legacy_op_tx(struct ieee80211_hw *hw, | 2494 | static void b43legacy_op_tx(struct ieee80211_hw *hw, |
2495 | struct ieee80211_tx_control *control, | ||
2495 | struct sk_buff *skb) | 2496 | struct sk_buff *skb) |
2496 | { | 2497 | { |
2497 | struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); | 2498 | struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw); |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 9e79d47e077f..a7be68d2eaf7 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |||
@@ -264,7 +264,9 @@ static void brcms_set_basic_rate(struct brcm_rateset *rs, u16 rate, bool is_br) | |||
264 | } | 264 | } |
265 | } | 265 | } |
266 | 266 | ||
267 | static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 267 | static void brcms_ops_tx(struct ieee80211_hw *hw, |
268 | struct ieee80211_tx_control *control, | ||
269 | struct sk_buff *skb) | ||
268 | { | 270 | { |
269 | struct brcms_info *wl = hw->priv; | 271 | struct brcms_info *wl = hw->priv; |
270 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 272 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
@@ -276,7 +278,7 @@ static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
276 | goto done; | 278 | goto done; |
277 | } | 279 | } |
278 | brcms_c_sendpkt_mac80211(wl->wlc, skb, hw); | 280 | brcms_c_sendpkt_mac80211(wl->wlc, skb, hw); |
279 | tx_info->rate_driver_data[0] = tx_info->control.sta; | 281 | tx_info->rate_driver_data[0] = control->sta; |
280 | done: | 282 | done: |
281 | spin_unlock_bh(&wl->lock); | 283 | spin_unlock_bh(&wl->lock); |
282 | } | 284 | } |
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index faec40467208..e252acb9c862 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -460,7 +460,9 @@ il3945_build_tx_cmd_basic(struct il_priv *il, struct il_device_cmd *cmd, | |||
460 | * start C_TX command process | 460 | * start C_TX command process |
461 | */ | 461 | */ |
462 | static int | 462 | static int |
463 | il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) | 463 | il3945_tx_skb(struct il_priv *il, |
464 | struct ieee80211_sta *sta, | ||
465 | struct sk_buff *skb) | ||
464 | { | 466 | { |
465 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 467 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
466 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 468 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -512,7 +514,7 @@ il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) | |||
512 | hdr_len = ieee80211_hdrlen(fc); | 514 | hdr_len = ieee80211_hdrlen(fc); |
513 | 515 | ||
514 | /* Find idx into station table for destination station */ | 516 | /* Find idx into station table for destination station */ |
515 | sta_id = il_sta_id_or_broadcast(il, info->control.sta); | 517 | sta_id = il_sta_id_or_broadcast(il, sta); |
516 | if (sta_id == IL_INVALID_STATION) { | 518 | if (sta_id == IL_INVALID_STATION) { |
517 | D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1); | 519 | D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1); |
518 | goto drop; | 520 | goto drop; |
@@ -2859,7 +2861,9 @@ il3945_mac_stop(struct ieee80211_hw *hw) | |||
2859 | } | 2861 | } |
2860 | 2862 | ||
2861 | static void | 2863 | static void |
2862 | il3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 2864 | il3945_mac_tx(struct ieee80211_hw *hw, |
2865 | struct ieee80211_tx_control *control, | ||
2866 | struct sk_buff *skb) | ||
2863 | { | 2867 | { |
2864 | struct il_priv *il = hw->priv; | 2868 | struct il_priv *il = hw->priv; |
2865 | 2869 | ||
@@ -2868,7 +2872,7 @@ il3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
2868 | D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, | 2872 | D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, |
2869 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); | 2873 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); |
2870 | 2874 | ||
2871 | if (il3945_tx_skb(il, skb)) | 2875 | if (il3945_tx_skb(il, control->sta, skb)) |
2872 | dev_kfree_skb_any(skb); | 2876 | dev_kfree_skb_any(skb); |
2873 | 2877 | ||
2874 | D_MAC80211("leave\n"); | 2878 | D_MAC80211("leave\n"); |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 34f61a0581a2..eac4dc8bc879 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -1526,8 +1526,11 @@ il4965_tx_cmd_build_basic(struct il_priv *il, struct sk_buff *skb, | |||
1526 | } | 1526 | } |
1527 | 1527 | ||
1528 | static void | 1528 | static void |
1529 | il4965_tx_cmd_build_rate(struct il_priv *il, struct il_tx_cmd *tx_cmd, | 1529 | il4965_tx_cmd_build_rate(struct il_priv *il, |
1530 | struct ieee80211_tx_info *info, __le16 fc) | 1530 | struct il_tx_cmd *tx_cmd, |
1531 | struct ieee80211_tx_info *info, | ||
1532 | struct ieee80211_sta *sta, | ||
1533 | __le16 fc) | ||
1531 | { | 1534 | { |
1532 | const u8 rts_retry_limit = 60; | 1535 | const u8 rts_retry_limit = 60; |
1533 | u32 rate_flags; | 1536 | u32 rate_flags; |
@@ -1561,9 +1564,7 @@ il4965_tx_cmd_build_rate(struct il_priv *il, struct il_tx_cmd *tx_cmd, | |||
1561 | rate_idx = info->control.rates[0].idx; | 1564 | rate_idx = info->control.rates[0].idx; |
1562 | if ((info->control.rates[0].flags & IEEE80211_TX_RC_MCS) || rate_idx < 0 | 1565 | if ((info->control.rates[0].flags & IEEE80211_TX_RC_MCS) || rate_idx < 0 |
1563 | || rate_idx > RATE_COUNT_LEGACY) | 1566 | || rate_idx > RATE_COUNT_LEGACY) |
1564 | rate_idx = | 1567 | rate_idx = rate_lowest_index(&il->bands[info->band], sta); |
1565 | rate_lowest_index(&il->bands[info->band], | ||
1566 | info->control.sta); | ||
1567 | /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ | 1568 | /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ |
1568 | if (info->band == IEEE80211_BAND_5GHZ) | 1569 | if (info->band == IEEE80211_BAND_5GHZ) |
1569 | rate_idx += IL_FIRST_OFDM_RATE; | 1570 | rate_idx += IL_FIRST_OFDM_RATE; |
@@ -1630,11 +1631,12 @@ il4965_tx_cmd_build_hwcrypto(struct il_priv *il, struct ieee80211_tx_info *info, | |||
1630 | * start C_TX command process | 1631 | * start C_TX command process |
1631 | */ | 1632 | */ |
1632 | int | 1633 | int |
1633 | il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) | 1634 | il4965_tx_skb(struct il_priv *il, |
1635 | struct ieee80211_sta *sta, | ||
1636 | struct sk_buff *skb) | ||
1634 | { | 1637 | { |
1635 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 1638 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
1636 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1639 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
1637 | struct ieee80211_sta *sta = info->control.sta; | ||
1638 | struct il_station_priv *sta_priv = NULL; | 1640 | struct il_station_priv *sta_priv = NULL; |
1639 | struct il_tx_queue *txq; | 1641 | struct il_tx_queue *txq; |
1640 | struct il_queue *q; | 1642 | struct il_queue *q; |
@@ -1680,7 +1682,7 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) | |||
1680 | sta_id = il->hw_params.bcast_id; | 1682 | sta_id = il->hw_params.bcast_id; |
1681 | else { | 1683 | else { |
1682 | /* Find idx into station table for destination station */ | 1684 | /* Find idx into station table for destination station */ |
1683 | sta_id = il_sta_id_or_broadcast(il, info->control.sta); | 1685 | sta_id = il_sta_id_or_broadcast(il, sta); |
1684 | 1686 | ||
1685 | if (sta_id == IL_INVALID_STATION) { | 1687 | if (sta_id == IL_INVALID_STATION) { |
1686 | D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1); | 1688 | D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1); |
@@ -1786,7 +1788,7 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) | |||
1786 | /* TODO need this for burst mode later on */ | 1788 | /* TODO need this for burst mode later on */ |
1787 | il4965_tx_cmd_build_basic(il, skb, tx_cmd, info, hdr, sta_id); | 1789 | il4965_tx_cmd_build_basic(il, skb, tx_cmd, info, hdr, sta_id); |
1788 | 1790 | ||
1789 | il4965_tx_cmd_build_rate(il, tx_cmd, info, fc); | 1791 | il4965_tx_cmd_build_rate(il, tx_cmd, info, sta, fc); |
1790 | 1792 | ||
1791 | il_update_stats(il, true, fc, len); | 1793 | il_update_stats(il, true, fc, len); |
1792 | /* | 1794 | /* |
@@ -5828,7 +5830,9 @@ il4965_mac_stop(struct ieee80211_hw *hw) | |||
5828 | } | 5830 | } |
5829 | 5831 | ||
5830 | void | 5832 | void |
5831 | il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 5833 | il4965_mac_tx(struct ieee80211_hw *hw, |
5834 | struct ieee80211_tx_control *control, | ||
5835 | struct sk_buff *skb) | ||
5832 | { | 5836 | { |
5833 | struct il_priv *il = hw->priv; | 5837 | struct il_priv *il = hw->priv; |
5834 | 5838 | ||
@@ -5837,7 +5841,7 @@ il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
5837 | D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, | 5841 | D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, |
5838 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); | 5842 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); |
5839 | 5843 | ||
5840 | if (il4965_tx_skb(il, skb)) | 5844 | if (il4965_tx_skb(il, control->sta, skb)) |
5841 | dev_kfree_skb_any(skb); | 5845 | dev_kfree_skb_any(skb); |
5842 | 5846 | ||
5843 | D_MACDUMP("leave\n"); | 5847 | D_MACDUMP("leave\n"); |
diff --git a/drivers/net/wireless/iwlegacy/4965.h b/drivers/net/wireless/iwlegacy/4965.h index 1db677689cfe..2d092f328547 100644 --- a/drivers/net/wireless/iwlegacy/4965.h +++ b/drivers/net/wireless/iwlegacy/4965.h | |||
@@ -78,7 +78,9 @@ int il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq, | |||
78 | int il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq); | 78 | int il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq); |
79 | void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags, | 79 | void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags, |
80 | struct ieee80211_tx_info *info); | 80 | struct ieee80211_tx_info *info); |
81 | int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb); | 81 | int il4965_tx_skb(struct il_priv *il, |
82 | struct ieee80211_sta *sta, | ||
83 | struct sk_buff *skb); | ||
82 | int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif, | 84 | int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif, |
83 | struct ieee80211_sta *sta, u16 tid, u16 * ssn); | 85 | struct ieee80211_sta *sta, u16 tid, u16 * ssn); |
84 | int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif, | 86 | int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif, |
@@ -163,7 +165,9 @@ void il4965_eeprom_release_semaphore(struct il_priv *il); | |||
163 | int il4965_eeprom_check_version(struct il_priv *il); | 165 | int il4965_eeprom_check_version(struct il_priv *il); |
164 | 166 | ||
165 | /* mac80211 handlers (for 4965) */ | 167 | /* mac80211 handlers (for 4965) */ |
166 | void il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb); | 168 | void il4965_mac_tx(struct ieee80211_hw *hw, |
169 | struct ieee80211_tx_control *control, | ||
170 | struct sk_buff *skb); | ||
167 | int il4965_mac_start(struct ieee80211_hw *hw); | 171 | int il4965_mac_start(struct ieee80211_hw *hw); |
168 | void il4965_mac_stop(struct ieee80211_hw *hw); | 172 | void il4965_mac_stop(struct ieee80211_hw *hw); |
169 | void il4965_configure_filter(struct ieee80211_hw *hw, | 173 | void il4965_configure_filter(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h index 9bb16bdf6d26..f0b8c1f7591c 100644 --- a/drivers/net/wireless/iwlwifi/dvm/agn.h +++ b/drivers/net/wireless/iwlwifi/dvm/agn.h | |||
@@ -201,7 +201,9 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success); | |||
201 | 201 | ||
202 | 202 | ||
203 | /* tx */ | 203 | /* tx */ |
204 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); | 204 | int iwlagn_tx_skb(struct iwl_priv *priv, |
205 | struct ieee80211_sta *sta, | ||
206 | struct sk_buff *skb); | ||
205 | int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, | 207 | int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, |
206 | struct ieee80211_sta *sta, u16 tid, u16 *ssn); | 208 | struct ieee80211_sta *sta, u16 tid, u16 *ssn); |
207 | int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif, | 209 | int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif, |
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index a5f7bce96325..e64af60a37c1 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
@@ -511,14 +511,16 @@ static void iwlagn_mac_set_wakeup(struct ieee80211_hw *hw, bool enabled) | |||
511 | } | 511 | } |
512 | #endif | 512 | #endif |
513 | 513 | ||
514 | static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 514 | static void iwlagn_mac_tx(struct ieee80211_hw *hw, |
515 | struct ieee80211_tx_control *control, | ||
516 | struct sk_buff *skb) | ||
515 | { | 517 | { |
516 | struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); | 518 | struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); |
517 | 519 | ||
518 | IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, | 520 | IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, |
519 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); | 521 | ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); |
520 | 522 | ||
521 | if (iwlagn_tx_skb(priv, skb)) | 523 | if (iwlagn_tx_skb(priv, control->sta, skb)) |
522 | dev_kfree_skb_any(skb); | 524 | dev_kfree_skb_any(skb); |
523 | } | 525 | } |
524 | 526 | ||
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index 5971a23aa47d..d17799b316d7 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c | |||
@@ -127,6 +127,7 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, | |||
127 | static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, | 127 | static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, |
128 | struct iwl_tx_cmd *tx_cmd, | 128 | struct iwl_tx_cmd *tx_cmd, |
129 | struct ieee80211_tx_info *info, | 129 | struct ieee80211_tx_info *info, |
130 | struct ieee80211_sta *sta, | ||
130 | __le16 fc) | 131 | __le16 fc) |
131 | { | 132 | { |
132 | u32 rate_flags; | 133 | u32 rate_flags; |
@@ -187,8 +188,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, | |||
187 | if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS || | 188 | if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS || |
188 | (rate_idx < 0) || (rate_idx > IWL_RATE_COUNT_LEGACY)) | 189 | (rate_idx < 0) || (rate_idx > IWL_RATE_COUNT_LEGACY)) |
189 | rate_idx = rate_lowest_index( | 190 | rate_idx = rate_lowest_index( |
190 | &priv->eeprom_data->bands[info->band], | 191 | &priv->eeprom_data->bands[info->band], sta); |
191 | info->control.sta); | ||
192 | /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ | 192 | /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ |
193 | if (info->band == IEEE80211_BAND_5GHZ) | 193 | if (info->band == IEEE80211_BAND_5GHZ) |
194 | rate_idx += IWL_FIRST_OFDM_RATE; | 194 | rate_idx += IWL_FIRST_OFDM_RATE; |
@@ -291,7 +291,9 @@ static int iwl_sta_id_or_broadcast(struct iwl_rxon_context *context, | |||
291 | /* | 291 | /* |
292 | * start REPLY_TX command process | 292 | * start REPLY_TX command process |
293 | */ | 293 | */ |
294 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | 294 | int iwlagn_tx_skb(struct iwl_priv *priv, |
295 | struct ieee80211_sta *sta, | ||
296 | struct sk_buff *skb) | ||
295 | { | 297 | { |
296 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 298 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
297 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 299 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -345,7 +347,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
345 | sta_id = ctx->bcast_sta_id; | 347 | sta_id = ctx->bcast_sta_id; |
346 | else { | 348 | else { |
347 | /* Find index into station table for destination station */ | 349 | /* Find index into station table for destination station */ |
348 | sta_id = iwl_sta_id_or_broadcast(ctx, info->control.sta); | 350 | sta_id = iwl_sta_id_or_broadcast(ctx, sta); |
349 | if (sta_id == IWL_INVALID_STATION) { | 351 | if (sta_id == IWL_INVALID_STATION) { |
350 | IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n", | 352 | IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n", |
351 | hdr->addr1); | 353 | hdr->addr1); |
@@ -355,8 +357,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
355 | 357 | ||
356 | IWL_DEBUG_TX(priv, "station Id %d\n", sta_id); | 358 | IWL_DEBUG_TX(priv, "station Id %d\n", sta_id); |
357 | 359 | ||
358 | if (info->control.sta) | 360 | if (sta) |
359 | sta_priv = (void *)info->control.sta->drv_priv; | 361 | sta_priv = (void *)sta->drv_priv; |
360 | 362 | ||
361 | if (sta_priv && sta_priv->asleep && | 363 | if (sta_priv && sta_priv->asleep && |
362 | (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) { | 364 | (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) { |
@@ -397,7 +399,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
397 | /* TODO need this for burst mode later on */ | 399 | /* TODO need this for burst mode later on */ |
398 | iwlagn_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id); | 400 | iwlagn_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id); |
399 | 401 | ||
400 | iwlagn_tx_cmd_build_rate(priv, tx_cmd, info, fc); | 402 | iwlagn_tx_cmd_build_rate(priv, tx_cmd, info, sta, fc); |
401 | 403 | ||
402 | memset(&info->status, 0, sizeof(info->status)); | 404 | memset(&info->status, 0, sizeof(info->status)); |
403 | 405 | ||
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index a03457292c88..7001856241e6 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -227,7 +227,9 @@ static void lbtf_free_adapter(struct lbtf_private *priv) | |||
227 | lbtf_deb_leave(LBTF_DEB_MAIN); | 227 | lbtf_deb_leave(LBTF_DEB_MAIN); |
228 | } | 228 | } |
229 | 229 | ||
230 | static void lbtf_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 230 | static void lbtf_op_tx(struct ieee80211_hw *hw, |
231 | struct ieee80211_tx_control *control, | ||
232 | struct sk_buff *skb) | ||
231 | { | 233 | { |
232 | struct lbtf_private *priv = hw->priv; | 234 | struct lbtf_private *priv = hw->priv; |
233 | 235 | ||
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 643f968b05ee..ed1386aa3b17 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -709,7 +709,9 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, | |||
709 | return ack; | 709 | return ack; |
710 | } | 710 | } |
711 | 711 | ||
712 | static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 712 | static void mac80211_hwsim_tx(struct ieee80211_hw *hw, |
713 | struct ieee80211_tx_control *control, | ||
714 | struct sk_buff *skb) | ||
713 | { | 715 | { |
714 | bool ack; | 716 | bool ack; |
715 | struct ieee80211_tx_info *txi; | 717 | struct ieee80211_tx_info *txi; |
@@ -741,8 +743,8 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
741 | 743 | ||
742 | if (txi->control.vif) | 744 | if (txi->control.vif) |
743 | hwsim_check_magic(txi->control.vif); | 745 | hwsim_check_magic(txi->control.vif); |
744 | if (txi->control.sta) | 746 | if (control->sta) |
745 | hwsim_check_sta_magic(txi->control.sta); | 747 | hwsim_check_sta_magic(control->sta); |
746 | 748 | ||
747 | ieee80211_tx_info_clear_status(txi); | 749 | ieee80211_tx_info_clear_status(txi); |
748 | 750 | ||
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 224e03ade145..5099e5375cb3 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1830,12 +1830,14 @@ static inline void mwl8k_tx_count_packet(struct ieee80211_sta *sta, u8 tid) | |||
1830 | } | 1830 | } |
1831 | 1831 | ||
1832 | static void | 1832 | static void |
1833 | mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) | 1833 | mwl8k_txq_xmit(struct ieee80211_hw *hw, |
1834 | int index, | ||
1835 | struct ieee80211_sta *sta, | ||
1836 | struct sk_buff *skb) | ||
1834 | { | 1837 | { |
1835 | struct mwl8k_priv *priv = hw->priv; | 1838 | struct mwl8k_priv *priv = hw->priv; |
1836 | struct ieee80211_tx_info *tx_info; | 1839 | struct ieee80211_tx_info *tx_info; |
1837 | struct mwl8k_vif *mwl8k_vif; | 1840 | struct mwl8k_vif *mwl8k_vif; |
1838 | struct ieee80211_sta *sta; | ||
1839 | struct ieee80211_hdr *wh; | 1841 | struct ieee80211_hdr *wh; |
1840 | struct mwl8k_tx_queue *txq; | 1842 | struct mwl8k_tx_queue *txq; |
1841 | struct mwl8k_tx_desc *tx; | 1843 | struct mwl8k_tx_desc *tx; |
@@ -1867,7 +1869,6 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) | |||
1867 | wh = &((struct mwl8k_dma_data *)skb->data)->wh; | 1869 | wh = &((struct mwl8k_dma_data *)skb->data)->wh; |
1868 | 1870 | ||
1869 | tx_info = IEEE80211_SKB_CB(skb); | 1871 | tx_info = IEEE80211_SKB_CB(skb); |
1870 | sta = tx_info->control.sta; | ||
1871 | mwl8k_vif = MWL8K_VIF(tx_info->control.vif); | 1872 | mwl8k_vif = MWL8K_VIF(tx_info->control.vif); |
1872 | 1873 | ||
1873 | if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { | 1874 | if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { |
@@ -2019,8 +2020,8 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) | |||
2019 | tx->pkt_phys_addr = cpu_to_le32(dma); | 2020 | tx->pkt_phys_addr = cpu_to_le32(dma); |
2020 | tx->pkt_len = cpu_to_le16(skb->len); | 2021 | tx->pkt_len = cpu_to_le16(skb->len); |
2021 | tx->rate_info = 0; | 2022 | tx->rate_info = 0; |
2022 | if (!priv->ap_fw && tx_info->control.sta != NULL) | 2023 | if (!priv->ap_fw && sta != NULL) |
2023 | tx->peer_id = MWL8K_STA(tx_info->control.sta)->peer_id; | 2024 | tx->peer_id = MWL8K_STA(sta)->peer_id; |
2024 | else | 2025 | else |
2025 | tx->peer_id = 0; | 2026 | tx->peer_id = 0; |
2026 | 2027 | ||
@@ -4364,7 +4365,9 @@ static void mwl8k_rx_poll(unsigned long data) | |||
4364 | /* | 4365 | /* |
4365 | * Core driver operations. | 4366 | * Core driver operations. |
4366 | */ | 4367 | */ |
4367 | static void mwl8k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 4368 | static void mwl8k_tx(struct ieee80211_hw *hw, |
4369 | struct ieee80211_tx_control *control, | ||
4370 | struct sk_buff *skb) | ||
4368 | { | 4371 | { |
4369 | struct mwl8k_priv *priv = hw->priv; | 4372 | struct mwl8k_priv *priv = hw->priv; |
4370 | int index = skb_get_queue_mapping(skb); | 4373 | int index = skb_get_queue_mapping(skb); |
@@ -4376,7 +4379,7 @@ static void mwl8k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
4376 | return; | 4379 | return; |
4377 | } | 4380 | } |
4378 | 4381 | ||
4379 | mwl8k_txq_xmit(hw, index, skb); | 4382 | mwl8k_txq_xmit(hw, index, control->sta, skb); |
4380 | } | 4383 | } |
4381 | 4384 | ||
4382 | static int mwl8k_start(struct ieee80211_hw *hw) | 4385 | static int mwl8k_start(struct ieee80211_hw *hw) |
diff --git a/drivers/net/wireless/p54/lmac.h b/drivers/net/wireless/p54/lmac.h index 3d8d622bec55..de1d46bf97df 100644 --- a/drivers/net/wireless/p54/lmac.h +++ b/drivers/net/wireless/p54/lmac.h | |||
@@ -526,7 +526,9 @@ int p54_init_leds(struct p54_common *priv); | |||
526 | void p54_unregister_leds(struct p54_common *priv); | 526 | void p54_unregister_leds(struct p54_common *priv); |
527 | 527 | ||
528 | /* xmit functions */ | 528 | /* xmit functions */ |
529 | void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb); | 529 | void p54_tx_80211(struct ieee80211_hw *dev, |
530 | struct ieee80211_tx_control *control, | ||
531 | struct sk_buff *skb); | ||
530 | int p54_tx_cancel(struct p54_common *priv, __le32 req_id); | 532 | int p54_tx_cancel(struct p54_common *priv, __le32 req_id); |
531 | void p54_tx(struct p54_common *priv, struct sk_buff *skb); | 533 | void p54_tx(struct p54_common *priv, struct sk_buff *skb); |
532 | 534 | ||
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index 7cffea795ad2..5e91ad06dd5d 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c | |||
@@ -158,7 +158,7 @@ static int p54_beacon_update(struct p54_common *priv, | |||
158 | * to cancel the old beacon template by hand, instead the firmware | 158 | * to cancel the old beacon template by hand, instead the firmware |
159 | * will release the previous one through the feedback mechanism. | 159 | * will release the previous one through the feedback mechanism. |
160 | */ | 160 | */ |
161 | p54_tx_80211(priv->hw, beacon); | 161 | p54_tx_80211(priv->hw, NULL, beacon); |
162 | priv->tsf_high32 = 0; | 162 | priv->tsf_high32 = 0; |
163 | priv->tsf_low32 = 0; | 163 | priv->tsf_low32 = 0; |
164 | 164 | ||
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index f38786e02623..5861e13a6fd8 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c | |||
@@ -676,8 +676,9 @@ int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
676 | EXPORT_SYMBOL_GPL(p54_rx); | 676 | EXPORT_SYMBOL_GPL(p54_rx); |
677 | 677 | ||
678 | static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb, | 678 | static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb, |
679 | struct ieee80211_tx_info *info, u8 *queue, | 679 | struct ieee80211_tx_info *info, |
680 | u32 *extra_len, u16 *flags, u16 *aid, | 680 | struct ieee80211_sta *sta, |
681 | u8 *queue, u32 *extra_len, u16 *flags, u16 *aid, | ||
681 | bool *burst_possible) | 682 | bool *burst_possible) |
682 | { | 683 | { |
683 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 684 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
@@ -746,8 +747,8 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb, | |||
746 | } | 747 | } |
747 | } | 748 | } |
748 | 749 | ||
749 | if (info->control.sta) | 750 | if (sta) |
750 | *aid = info->control.sta->aid; | 751 | *aid = sta->aid; |
751 | break; | 752 | break; |
752 | } | 753 | } |
753 | } | 754 | } |
@@ -767,7 +768,9 @@ static u8 p54_convert_algo(u32 cipher) | |||
767 | } | 768 | } |
768 | } | 769 | } |
769 | 770 | ||
770 | void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb) | 771 | void p54_tx_80211(struct ieee80211_hw *dev, |
772 | struct ieee80211_tx_control *control, | ||
773 | struct sk_buff *skb) | ||
771 | { | 774 | { |
772 | struct p54_common *priv = dev->priv; | 775 | struct p54_common *priv = dev->priv; |
773 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 776 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -784,7 +787,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
784 | u8 nrates = 0, nremaining = 8; | 787 | u8 nrates = 0, nremaining = 8; |
785 | bool burst_allowed = false; | 788 | bool burst_allowed = false; |
786 | 789 | ||
787 | p54_tx_80211_header(priv, skb, info, &queue, &extra_len, | 790 | p54_tx_80211_header(priv, skb, info, control->sta, &queue, &extra_len, |
788 | &hdr_flags, &aid, &burst_allowed); | 791 | &hdr_flags, &aid, &burst_allowed); |
789 | 792 | ||
790 | if (p54_tx_qos_accounting_alloc(priv, skb, queue)) { | 793 | if (p54_tx_qos_accounting_alloc(priv, skb, queue)) { |
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 8afb546c2b2d..f991e8bedc70 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -1287,7 +1287,9 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp); | |||
1287 | /* | 1287 | /* |
1288 | * mac80211 handlers. | 1288 | * mac80211 handlers. |
1289 | */ | 1289 | */ |
1290 | void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb); | 1290 | void rt2x00mac_tx(struct ieee80211_hw *hw, |
1291 | struct ieee80211_tx_control *control, | ||
1292 | struct sk_buff *skb); | ||
1291 | int rt2x00mac_start(struct ieee80211_hw *hw); | 1293 | int rt2x00mac_start(struct ieee80211_hw *hw); |
1292 | void rt2x00mac_stop(struct ieee80211_hw *hw); | 1294 | void rt2x00mac_stop(struct ieee80211_hw *hw); |
1293 | int rt2x00mac_add_interface(struct ieee80211_hw *hw, | 1295 | int rt2x00mac_add_interface(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index a6b88bd4a1a5..a59048ffa092 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -194,7 +194,7 @@ static void rt2x00lib_bc_buffer_iter(void *data, u8 *mac, | |||
194 | */ | 194 | */ |
195 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); | 195 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); |
196 | while (skb) { | 196 | while (skb) { |
197 | rt2x00mac_tx(rt2x00dev->hw, skb); | 197 | rt2x00mac_tx(rt2x00dev->hw, NULL, skb); |
198 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); | 198 | skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif); |
199 | } | 199 | } |
200 | } | 200 | } |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 4ff26c2159bf..c3d0f2f87b69 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -99,7 +99,9 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, | |||
99 | return retval; | 99 | return retval; |
100 | } | 100 | } |
101 | 101 | ||
102 | void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 102 | void rt2x00mac_tx(struct ieee80211_hw *hw, |
103 | struct ieee80211_tx_control *control, | ||
104 | struct sk_buff *skb) | ||
103 | { | 105 | { |
104 | struct rt2x00_dev *rt2x00dev = hw->priv; | 106 | struct rt2x00_dev *rt2x00dev = hw->priv; |
105 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 107 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index f7e74a0a7759..e488b944a034 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -315,6 +315,7 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct rt2x00_dev *rt2x00dev, | |||
315 | static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | 315 | static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, |
316 | struct sk_buff *skb, | 316 | struct sk_buff *skb, |
317 | struct txentry_desc *txdesc, | 317 | struct txentry_desc *txdesc, |
318 | struct ieee80211_sta *sta, | ||
318 | const struct rt2x00_rate *hwrate) | 319 | const struct rt2x00_rate *hwrate) |
319 | { | 320 | { |
320 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 321 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
@@ -322,11 +323,11 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
322 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 323 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
323 | struct rt2x00_sta *sta_priv = NULL; | 324 | struct rt2x00_sta *sta_priv = NULL; |
324 | 325 | ||
325 | if (tx_info->control.sta) { | 326 | if (sta) { |
326 | txdesc->u.ht.mpdu_density = | 327 | txdesc->u.ht.mpdu_density = |
327 | tx_info->control.sta->ht_cap.ampdu_density; | 328 | sta->ht_cap.ampdu_density; |
328 | 329 | ||
329 | sta_priv = sta_to_rt2x00_sta(tx_info->control.sta); | 330 | sta_priv = sta_to_rt2x00_sta(sta); |
330 | txdesc->u.ht.wcid = sta_priv->wcid; | 331 | txdesc->u.ht.wcid = sta_priv->wcid; |
331 | } | 332 | } |
332 | 333 | ||
@@ -341,8 +342,8 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
341 | * MIMO PS should be set to 1 for STA's using dynamic SM PS | 342 | * MIMO PS should be set to 1 for STA's using dynamic SM PS |
342 | * when using more then one tx stream (>MCS7). | 343 | * when using more then one tx stream (>MCS7). |
343 | */ | 344 | */ |
344 | if (tx_info->control.sta && txdesc->u.ht.mcs > 7 && | 345 | if (sta && txdesc->u.ht.mcs > 7 && |
345 | ((tx_info->control.sta->ht_cap.cap & | 346 | ((sta->ht_cap.cap & |
346 | IEEE80211_HT_CAP_SM_PS) >> | 347 | IEEE80211_HT_CAP_SM_PS) >> |
347 | IEEE80211_HT_CAP_SM_PS_SHIFT) == | 348 | IEEE80211_HT_CAP_SM_PS_SHIFT) == |
348 | WLAN_HT_CAP_SM_PS_DYNAMIC) | 349 | WLAN_HT_CAP_SM_PS_DYNAMIC) |
@@ -409,7 +410,8 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
409 | 410 | ||
410 | static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, | 411 | static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, |
411 | struct sk_buff *skb, | 412 | struct sk_buff *skb, |
412 | struct txentry_desc *txdesc) | 413 | struct txentry_desc *txdesc, |
414 | struct ieee80211_sta *sta) | ||
413 | { | 415 | { |
414 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 416 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
415 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 417 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
@@ -503,7 +505,7 @@ static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, | |||
503 | 505 | ||
504 | if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags)) | 506 | if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags)) |
505 | rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc, | 507 | rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc, |
506 | hwrate); | 508 | sta, hwrate); |
507 | else | 509 | else |
508 | rt2x00queue_create_tx_descriptor_plcp(rt2x00dev, skb, txdesc, | 510 | rt2x00queue_create_tx_descriptor_plcp(rt2x00dev, skb, txdesc, |
509 | hwrate); | 511 | hwrate); |
@@ -595,7 +597,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
595 | * after that we are free to use the skb->cb array | 597 | * after that we are free to use the skb->cb array |
596 | * for our information. | 598 | * for our information. |
597 | */ | 599 | */ |
598 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc); | 600 | rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL); |
599 | 601 | ||
600 | /* | 602 | /* |
601 | * All information is retrieved from the skb->cb array, | 603 | * All information is retrieved from the skb->cb array, |
@@ -740,7 +742,7 @@ int rt2x00queue_update_beacon_locked(struct rt2x00_dev *rt2x00dev, | |||
740 | * after that we are free to use the skb->cb array | 742 | * after that we are free to use the skb->cb array |
741 | * for our information. | 743 | * for our information. |
742 | */ | 744 | */ |
743 | rt2x00queue_create_tx_descriptor(rt2x00dev, intf->beacon->skb, &txdesc); | 745 | rt2x00queue_create_tx_descriptor(rt2x00dev, intf->beacon->skb, &txdesc, NULL); |
744 | 746 | ||
745 | /* | 747 | /* |
746 | * Fill in skb descriptor | 748 | * Fill in skb descriptor |
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index aceaf689f737..021d83e1b1d3 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c | |||
@@ -244,7 +244,9 @@ static irqreturn_t rtl8180_interrupt(int irq, void *dev_id) | |||
244 | return IRQ_HANDLED; | 244 | return IRQ_HANDLED; |
245 | } | 245 | } |
246 | 246 | ||
247 | static void rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | 247 | static void rtl8180_tx(struct ieee80211_hw *dev, |
248 | struct ieee80211_tx_control *control, | ||
249 | struct sk_buff *skb) | ||
248 | { | 250 | { |
249 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 251 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
250 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 252 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
@@ -710,7 +712,7 @@ static void rtl8180_beacon_work(struct work_struct *work) | |||
710 | /* TODO: use actual beacon queue */ | 712 | /* TODO: use actual beacon queue */ |
711 | skb_set_queue_mapping(skb, 0); | 713 | skb_set_queue_mapping(skb, 0); |
712 | 714 | ||
713 | rtl8180_tx(dev, skb); | 715 | rtl8180_tx(dev, NULL, skb); |
714 | 716 | ||
715 | resched: | 717 | resched: |
716 | /* | 718 | /* |
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c index 71a30b026089..05d8ca045afd 100644 --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c | |||
@@ -228,7 +228,9 @@ static void rtl8187_tx_cb(struct urb *urb) | |||
228 | } | 228 | } |
229 | } | 229 | } |
230 | 230 | ||
231 | static void rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | 231 | static void rtl8187_tx(struct ieee80211_hw *dev, |
232 | struct ieee80211_tx_control *control, | ||
233 | struct sk_buff *skb) | ||
232 | { | 234 | { |
233 | struct rtl8187_priv *priv = dev->priv; | 235 | struct rtl8187_priv *priv = dev->priv; |
234 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 236 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -1076,7 +1078,7 @@ static void rtl8187_beacon_work(struct work_struct *work) | |||
1076 | /* TODO: use actual beacon queue */ | 1078 | /* TODO: use actual beacon queue */ |
1077 | skb_set_queue_mapping(skb, 0); | 1079 | skb_set_queue_mapping(skb, 0); |
1078 | 1080 | ||
1079 | rtl8187_tx(dev, skb); | 1081 | rtl8187_tx(dev, NULL, skb); |
1080 | 1082 | ||
1081 | resched: | 1083 | resched: |
1082 | /* | 1084 | /* |
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 942e56b77b60..59381fe8ed06 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -1341,9 +1341,8 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, | |||
1341 | rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0); | 1341 | rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0); |
1342 | 1342 | ||
1343 | info->control.rates[0].idx = 0; | 1343 | info->control.rates[0].idx = 0; |
1344 | info->control.sta = sta; | ||
1345 | info->band = hw->conf.channel->band; | 1344 | info->band = hw->conf.channel->band; |
1346 | rtlpriv->intf_ops->adapter_tx(hw, skb, &tcb_desc); | 1345 | rtlpriv->intf_ops->adapter_tx(hw, sta, skb, &tcb_desc); |
1347 | } | 1346 | } |
1348 | err_free: | 1347 | err_free: |
1349 | return 0; | 1348 | return 0; |
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index a18ad2a98938..a7c0e52869ba 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -124,7 +124,9 @@ static void rtl_op_stop(struct ieee80211_hw *hw) | |||
124 | mutex_unlock(&rtlpriv->locks.conf_mutex); | 124 | mutex_unlock(&rtlpriv->locks.conf_mutex); |
125 | } | 125 | } |
126 | 126 | ||
127 | static void rtl_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 127 | static void rtl_op_tx(struct ieee80211_hw *hw, |
128 | struct ieee80211_tx_control *control, | ||
129 | struct sk_buff *skb) | ||
128 | { | 130 | { |
129 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 131 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
130 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 132 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
@@ -138,8 +140,8 @@ static void rtl_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
138 | if (!test_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status)) | 140 | if (!test_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status)) |
139 | goto err_free; | 141 | goto err_free; |
140 | 142 | ||
141 | if (!rtlpriv->intf_ops->waitq_insert(hw, skb)) | 143 | if (!rtlpriv->intf_ops->waitq_insert(hw, control->sta, skb)) |
142 | rtlpriv->intf_ops->adapter_tx(hw, skb, &tcb_desc); | 144 | rtlpriv->intf_ops->adapter_tx(hw, control->sta, skb, &tcb_desc); |
143 | 145 | ||
144 | return; | 146 | return; |
145 | 147 | ||
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 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 52166640f167..390d6d4fcaa0 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | |||
@@ -596,7 +596,9 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, | |||
596 | 596 | ||
597 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, | 597 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, |
598 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 598 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
599 | struct ieee80211_tx_info *info, struct sk_buff *skb, | 599 | struct ieee80211_tx_info *info, |
600 | struct ieee80211_sta *sta, | ||
601 | struct sk_buff *skb, | ||
600 | u8 hw_queue, struct rtl_tcb_desc *tcb_desc) | 602 | u8 hw_queue, struct rtl_tcb_desc *tcb_desc) |
601 | { | 603 | { |
602 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 604 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
@@ -604,7 +606,6 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, | |||
604 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 606 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
605 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 607 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
606 | bool defaultadapter = true; | 608 | bool defaultadapter = true; |
607 | struct ieee80211_sta *sta; | ||
608 | u8 *pdesc = pdesc_tx; | 609 | u8 *pdesc = pdesc_tx; |
609 | u16 seq_number; | 610 | u16 seq_number; |
610 | __le16 fc = hdr->frame_control; | 611 | __le16 fc = hdr->frame_control; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h index c4adb9777365..a7cdd514cb2e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | |||
@@ -713,6 +713,7 @@ struct rx_desc_92c { | |||
713 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, | 713 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, |
714 | struct ieee80211_hdr *hdr, | 714 | struct ieee80211_hdr *hdr, |
715 | u8 *pdesc, struct ieee80211_tx_info *info, | 715 | u8 *pdesc, struct ieee80211_tx_info *info, |
716 | struct ieee80211_sta *sta, | ||
716 | struct sk_buff *skb, u8 hw_queue, | 717 | struct sk_buff *skb, u8 hw_queue, |
717 | struct rtl_tcb_desc *ptcb_desc); | 718 | struct rtl_tcb_desc *ptcb_desc); |
718 | bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, | 719 | bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index 2e6eb356a93e..27863d773790 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | |||
@@ -496,7 +496,9 @@ static void _rtl_tx_desc_checksum(u8 *txdesc) | |||
496 | 496 | ||
497 | void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, | 497 | void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, |
498 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 498 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
499 | struct ieee80211_tx_info *info, struct sk_buff *skb, | 499 | struct ieee80211_tx_info *info, |
500 | struct ieee80211_sta *sta, | ||
501 | struct sk_buff *skb, | ||
500 | u8 queue_index, | 502 | u8 queue_index, |
501 | struct rtl_tcb_desc *tcb_desc) | 503 | struct rtl_tcb_desc *tcb_desc) |
502 | { | 504 | { |
@@ -504,7 +506,6 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, | |||
504 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 506 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
505 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 507 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
506 | bool defaultadapter = true; | 508 | bool defaultadapter = true; |
507 | struct ieee80211_sta *sta = info->control.sta = info->control.sta; | ||
508 | u8 *qc = ieee80211_get_qos_ctl(hdr); | 509 | u8 *qc = ieee80211_get_qos_ctl(hdr); |
509 | u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; | 510 | u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; |
510 | u16 seq_number; | 511 | u16 seq_number; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h index 332b06e78b00..725c53accc58 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | |||
@@ -420,7 +420,9 @@ struct sk_buff *rtl8192c_tx_aggregate_hdl(struct ieee80211_hw *, | |||
420 | struct sk_buff_head *); | 420 | struct sk_buff_head *); |
421 | void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, | 421 | void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, |
422 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 422 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
423 | struct ieee80211_tx_info *info, struct sk_buff *skb, | 423 | struct ieee80211_tx_info *info, |
424 | struct ieee80211_sta *sta, | ||
425 | struct sk_buff *skb, | ||
424 | u8 queue_index, | 426 | u8 queue_index, |
425 | struct rtl_tcb_desc *tcb_desc); | 427 | struct rtl_tcb_desc *tcb_desc); |
426 | void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, | 428 | void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c index f80690d82c11..4686f340b9d6 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c | |||
@@ -551,7 +551,9 @@ static void _rtl92de_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, | |||
551 | 551 | ||
552 | void rtl92de_tx_fill_desc(struct ieee80211_hw *hw, | 552 | void rtl92de_tx_fill_desc(struct ieee80211_hw *hw, |
553 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 553 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
554 | struct ieee80211_tx_info *info, struct sk_buff *skb, | 554 | struct ieee80211_tx_info *info, |
555 | struct ieee80211_sta *sta, | ||
556 | struct sk_buff *skb, | ||
555 | u8 hw_queue, struct rtl_tcb_desc *ptcb_desc) | 557 | u8 hw_queue, struct rtl_tcb_desc *ptcb_desc) |
556 | { | 558 | { |
557 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 559 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
@@ -559,7 +561,6 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw, | |||
559 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 561 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
560 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); | 562 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); |
561 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 563 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
562 | struct ieee80211_sta *sta = info->control.sta; | ||
563 | u8 *pdesc = pdesc_tx; | 564 | u8 *pdesc = pdesc_tx; |
564 | u16 seq_number; | 565 | u16 seq_number; |
565 | __le16 fc = hdr->frame_control; | 566 | __le16 fc = hdr->frame_control; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h index 057a52431b00..c1b5dfb79d53 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h | |||
@@ -730,6 +730,7 @@ struct rx_desc_92d { | |||
730 | void rtl92de_tx_fill_desc(struct ieee80211_hw *hw, | 730 | void rtl92de_tx_fill_desc(struct ieee80211_hw *hw, |
731 | struct ieee80211_hdr *hdr, | 731 | struct ieee80211_hdr *hdr, |
732 | u8 *pdesc, struct ieee80211_tx_info *info, | 732 | u8 *pdesc, struct ieee80211_tx_info *info, |
733 | struct ieee80211_sta *sta, | ||
733 | struct sk_buff *skb, u8 hw_queue, | 734 | struct sk_buff *skb, u8 hw_queue, |
734 | struct rtl_tcb_desc *ptcb_desc); | 735 | struct rtl_tcb_desc *ptcb_desc); |
735 | bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, | 736 | bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c index 36d1cb3aef8a..28c53fb12aeb 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c | |||
@@ -591,14 +591,15 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats, | |||
591 | 591 | ||
592 | void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, | 592 | void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, |
593 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 593 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
594 | struct ieee80211_tx_info *info, struct sk_buff *skb, | 594 | struct ieee80211_tx_info *info, |
595 | struct ieee80211_sta *sta, | ||
596 | struct sk_buff *skb, | ||
595 | u8 hw_queue, struct rtl_tcb_desc *ptcb_desc) | 597 | u8 hw_queue, struct rtl_tcb_desc *ptcb_desc) |
596 | { | 598 | { |
597 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 599 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
598 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 600 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
599 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 601 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
600 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 602 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
601 | struct ieee80211_sta *sta = info->control.sta; | ||
602 | u8 *pdesc = pdesc_tx; | 603 | u8 *pdesc = pdesc_tx; |
603 | u16 seq_number; | 604 | u16 seq_number; |
604 | __le16 fc = hdr->frame_control; | 605 | __le16 fc = hdr->frame_control; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h index 011e7b0695f2..64dd66f287c1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h | |||
@@ -31,6 +31,7 @@ | |||
31 | 31 | ||
32 | void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, | 32 | void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, |
33 | u8 *pdesc, struct ieee80211_tx_info *info, | 33 | u8 *pdesc, struct ieee80211_tx_info *info, |
34 | struct ieee80211_sta *sta, | ||
34 | struct sk_buff *skb, u8 hw_queue, | 35 | struct sk_buff *skb, u8 hw_queue, |
35 | struct rtl_tcb_desc *ptcb_desc); | 36 | struct rtl_tcb_desc *ptcb_desc); |
36 | void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool firstseg, | 37 | void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool firstseg, |
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; |
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index cdaa21f29710..40153e7bf702 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -122,7 +122,7 @@ enum rt_eeprom_type { | |||
122 | EEPROM_BOOT_EFUSE, | 122 | EEPROM_BOOT_EFUSE, |
123 | }; | 123 | }; |
124 | 124 | ||
125 | enum rtl_status { | 125 | enum ttl_status { |
126 | RTL_STATUS_INTERFACE_START = 0, | 126 | RTL_STATUS_INTERFACE_START = 0, |
127 | }; | 127 | }; |
128 | 128 | ||
@@ -1418,6 +1418,7 @@ struct rtl_hal_ops { | |||
1418 | void (*fill_tx_desc) (struct ieee80211_hw *hw, | 1418 | void (*fill_tx_desc) (struct ieee80211_hw *hw, |
1419 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, | 1419 | struct ieee80211_hdr *hdr, u8 *pdesc_tx, |
1420 | struct ieee80211_tx_info *info, | 1420 | struct ieee80211_tx_info *info, |
1421 | struct ieee80211_sta *sta, | ||
1421 | struct sk_buff *skb, u8 hw_queue, | 1422 | struct sk_buff *skb, u8 hw_queue, |
1422 | struct rtl_tcb_desc *ptcb_desc); | 1423 | struct rtl_tcb_desc *ptcb_desc); |
1423 | void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pDesc, | 1424 | void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pDesc, |
@@ -1475,11 +1476,15 @@ struct rtl_intf_ops { | |||
1475 | int (*adapter_start) (struct ieee80211_hw *hw); | 1476 | int (*adapter_start) (struct ieee80211_hw *hw); |
1476 | void (*adapter_stop) (struct ieee80211_hw *hw); | 1477 | void (*adapter_stop) (struct ieee80211_hw *hw); |
1477 | 1478 | ||
1478 | int (*adapter_tx) (struct ieee80211_hw *hw, struct sk_buff *skb, | 1479 | int (*adapter_tx) (struct ieee80211_hw *hw, |
1479 | struct rtl_tcb_desc *ptcb_desc); | 1480 | struct ieee80211_sta *sta, |
1481 | struct sk_buff *skb, | ||
1482 | struct rtl_tcb_desc *ptcb_desc); | ||
1480 | void (*flush)(struct ieee80211_hw *hw, bool drop); | 1483 | void (*flush)(struct ieee80211_hw *hw, bool drop); |
1481 | int (*reset_trx_ring) (struct ieee80211_hw *hw); | 1484 | int (*reset_trx_ring) (struct ieee80211_hw *hw); |
1482 | bool (*waitq_insert) (struct ieee80211_hw *hw, struct sk_buff *skb); | 1485 | bool (*waitq_insert) (struct ieee80211_hw *hw, |
1486 | struct ieee80211_sta *sta, | ||
1487 | struct sk_buff *skb); | ||
1483 | 1488 | ||
1484 | /*pci */ | 1489 | /*pci */ |
1485 | void (*disable_aspm) (struct ieee80211_hw *hw); | 1490 | void (*disable_aspm) (struct ieee80211_hw *hw); |
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 3118c425bcf1..441cbccbd381 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c | |||
@@ -354,7 +354,9 @@ out: | |||
354 | return ret; | 354 | return ret; |
355 | } | 355 | } |
356 | 356 | ||
357 | static void wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 357 | static void wl1251_op_tx(struct ieee80211_hw *hw, |
358 | struct ieee80211_tx_control *control, | ||
359 | struct sk_buff *skb) | ||
358 | { | 360 | { |
359 | struct wl1251 *wl = hw->priv; | 361 | struct wl1251 *wl = hw->priv; |
360 | unsigned long flags; | 362 | unsigned long flags; |
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 5efd5919db3b..ff830cf50c70 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c | |||
@@ -1181,7 +1181,9 @@ out: | |||
1181 | return ret; | 1181 | return ret; |
1182 | } | 1182 | } |
1183 | 1183 | ||
1184 | static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 1184 | static void wl1271_op_tx(struct ieee80211_hw *hw, |
1185 | struct ieee80211_tx_control *control, | ||
1186 | struct sk_buff *skb) | ||
1185 | { | 1187 | { |
1186 | struct wl1271 *wl = hw->priv; | 1188 | struct wl1271 *wl = hw->priv; |
1187 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 1189 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -1197,7 +1199,7 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1197 | mapping = skb_get_queue_mapping(skb); | 1199 | mapping = skb_get_queue_mapping(skb); |
1198 | q = wl1271_tx_get_queue(mapping); | 1200 | q = wl1271_tx_get_queue(mapping); |
1199 | 1201 | ||
1200 | hlid = wl12xx_tx_get_hlid(wl, wlvif, skb, info->control.sta); | 1202 | hlid = wl12xx_tx_get_hlid(wl, wlvif, skb, control->sta); |
1201 | 1203 | ||
1202 | spin_lock_irqsave(&wl->wl_lock, flags); | 1204 | spin_lock_irqsave(&wl->wl_lock, flags); |
1203 | 1205 | ||
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index c9e2660e1263..459880104758 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -937,7 +937,9 @@ static int fill_ctrlset(struct zd_mac *mac, | |||
937 | * control block of the skbuff will be initialized. If necessary the incoming | 937 | * control block of the skbuff will be initialized. If necessary the incoming |
938 | * mac80211 queues will be stopped. | 938 | * mac80211 queues will be stopped. |
939 | */ | 939 | */ |
940 | static void zd_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 940 | static void zd_op_tx(struct ieee80211_hw *hw, |
941 | struct ieee80211_tx_control *control, | ||
942 | struct sk_buff *skb) | ||
941 | { | 943 | { |
942 | struct zd_mac *mac = zd_hw_mac(hw); | 944 | struct zd_mac *mac = zd_hw_mac(hw); |
943 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 945 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -1176,7 +1178,7 @@ static void zd_beacon_done(struct zd_mac *mac) | |||
1176 | skb = ieee80211_get_buffered_bc(mac->hw, mac->vif); | 1178 | skb = ieee80211_get_buffered_bc(mac->hw, mac->vif); |
1177 | if (!skb) | 1179 | if (!skb) |
1178 | break; | 1180 | break; |
1179 | zd_op_tx(mac->hw, skb); | 1181 | zd_op_tx(mac->hw, NULL, skb); |
1180 | } | 1182 | } |
1181 | 1183 | ||
1182 | /* | 1184 | /* |