| Message ID | 1376036014-29707-2-git-send-email-michal.kazior@tieto.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Michal Kazior <michal.kazior@tieto.com> writes: > The tids weren't mapped really properly. This > doesn't fix any known bug but seems the right > thing to do. > > Signed-off-by: Michal Kazior <michal.kazior@tieto.com> [...] > enum htt_data_tx_ext_tid { > - HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 16, > - HTT_DATA_TX_EXT_TID_MGMT = 17, > + HTT_DATA_TX_EXT_TID_NON_QOS_UNICAST = 16, > + HTT_DATA_TX_EXT_TID_UNUSED = 17, > + HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 18, > + HTT_DATA_TX_EXT_TID_MGMT = 19, > HTT_DATA_TX_EXT_TID_INVALID = 31 > }; This doesn't seem to match what firmware uses. We need to investigate more about this so I drop the patch for now.
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h index 318be46..de45d02 100644 --- a/drivers/net/wireless/ath/ath10k/htt.h +++ b/drivers/net/wireless/ath/ath10k/htt.h @@ -106,8 +106,10 @@ enum htt_data_tx_desc_flags1 { }; enum htt_data_tx_ext_tid { - HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 16, - HTT_DATA_TX_EXT_TID_MGMT = 17, + HTT_DATA_TX_EXT_TID_NON_QOS_UNICAST = 16, + HTT_DATA_TX_EXT_TID_UNUSED = 17, + HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 18, + HTT_DATA_TX_EXT_TID_MGMT = 19, HTT_DATA_TX_EXT_TID_INVALID = 31 }; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index cf2ba4d..cc6ad7a 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1726,11 +1726,14 @@ static void ath10k_tx(struct ieee80211_hw *hw, /* we must calculate tid before we apply qos workaround * as we'd lose the qos control field */ - tid = HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST; if (ieee80211_is_data_qos(hdr->frame_control) && is_unicast_ether_addr(ieee80211_get_DA(hdr))) { u8 *qc = ieee80211_get_qos_ctl(hdr); tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; + } else if (is_unicast_ether_addr(ieee80211_get_DA(hdr))) { + tid = HTT_DATA_TX_EXT_TID_NON_QOS_UNICAST; + } else { + tid = HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST; } /* it makes no sense to process injected frames like that */
The tids weren't mapped really properly. This doesn't fix any known bug but seems the right thing to do. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> --- patch: * use brackets {} drivers/net/wireless/ath/ath10k/htt.h | 6 ++++-- drivers/net/wireless/ath/ath10k/mac.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-)