mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-19 18:31:33 +00:00
3affbc1cad
This series is based on * 2020-07-10 ipq6018-ilq-11-0_qca_oem-034672b0676c37b1f4519e5720e18e95fe6236ef Add support for * qsdk kernel/v4.4 * qsdk ethernet subsystem * v5.7 ath11k backport + QualComm staging patches (wlan_ap_1.0) * ath11k-firmware * hostapd/iw/... Feature support * full boot, system detection * sysupgrade to nand * HE support via latest hostapd * driver support for usb, crypto, hwmon, cpufreq, ... Missing * NSS/HW flow offloading - FW blob is not redistributable Using the qsdk v4.4 is an intermediate solution while the vanilla is being tested. Vanilla kernel is almost on feature par. Work has already started to upstream the ethernet and switch drivers. Once complete the target will be fully upstream. Signed-off-by: John Crispin <john@phrozen.org>
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
drivers/net/wireless/ath/ath11k/dp_tx.c | 20 +++++++++++++++++---
|
|
1 file changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/dp_tx.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
|
|
@@ -307,6 +307,8 @@ ath11k_dp_tx_htt_tx_complete_buf(struct
|
|
struct ieee80211_tx_info *info;
|
|
struct ath11k_skb_cb *skb_cb;
|
|
struct ath11k *ar;
|
|
+ struct ieee80211_vif *vif;
|
|
+ u8 flags = 0;
|
|
|
|
spin_lock_bh(&tx_ring->tx_idr_lock);
|
|
msdu = idr_find(&tx_ring->txbuf_idr, ts->msdu_id);
|
|
@@ -328,6 +330,8 @@ ath11k_dp_tx_htt_tx_complete_buf(struct
|
|
if (atomic_dec_and_test(&ar->dp.num_tx_pending))
|
|
wake_up(&ar->dp.tx_empty_waitq);
|
|
|
|
+ flags = skb_cb->flags;
|
|
+ vif = skb_cb->vif;
|
|
dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);
|
|
|
|
memset(&info->status, 0, sizeof(info->status));
|
|
@@ -342,8 +346,10 @@ ath11k_dp_tx_htt_tx_complete_buf(struct
|
|
info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;
|
|
}
|
|
}
|
|
-
|
|
- ieee80211_tx_status(ar->hw, msdu);
|
|
+ if (flags & ATH11K_SKB_HW_80211_ENCAP)
|
|
+ ieee80211_tx_status_8023(ar->hw, vif, msdu);
|
|
+ else
|
|
+ ieee80211_tx_status(ar->hw, msdu);
|
|
}
|
|
|
|
static void
|
|
@@ -411,6 +417,8 @@ static void ath11k_dp_tx_complete_msdu(s
|
|
struct ath11k_skb_cb *skb_cb;
|
|
struct ath11k_peer *peer;
|
|
struct ath11k_sta *arsta;
|
|
+ struct ieee80211_vif *vif;
|
|
+ u8 flags = 0;
|
|
|
|
if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {
|
|
/* Must not happen */
|
|
@@ -433,6 +441,9 @@ static void ath11k_dp_tx_complete_msdu(s
|
|
goto exit;
|
|
}
|
|
|
|
+ flags = skb_cb->flags;
|
|
+ vif = skb_cb->vif;
|
|
+
|
|
info = IEEE80211_SKB_CB(msdu);
|
|
memset(&info->status, 0, sizeof(info->status));
|
|
|
|
@@ -494,7 +505,10 @@ static void ath11k_dp_tx_complete_msdu(s
|
|
status.info = info;
|
|
status.rate = &arsta->last_txrate;
|
|
rcu_read_unlock();
|
|
- ieee80211_tx_status_ext(ar->hw, &status);
|
|
+ if (flags & ATH11K_SKB_HW_80211_ENCAP)
|
|
+ ieee80211_tx_status_8023(ar->hw, vif, msdu);
|
|
+ else
|
|
+ ieee80211_tx_status_ext(ar->hw, &status);
|
|
spin_unlock_bh(&ab->base_lock);
|
|
return;
|
|
exit:
|