Skip to content

L
linux
Commit 85f6d7cf authored by Janusz Dziedzic's avatar Janusz Dziedzic Committed by Kalle Valo
Browse files
Options

ath10k: finally kill htt_rx_info 

Struct htt_rx_info is not needed anymore while
we will use ieee80211_rx_status structure as
a template.
Signed-off-by: default avatarJanusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 78433f96
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 65 deletions
drivers/net/wireless/ath/ath10k/htt.h
View file @ 85f6d7cf
...@@ -1173,11 +1173,6 @@ struct htt_peer_unmap_event { ...@@ -1173,11 +1173,6 @@ struct htt_peer_unmap_event {
u16 peer_id; u16 peer_id;
}; };
struct htt_rx_info {
struct sk_buff *skb;
struct ieee80211_rx_status rx_status;
};
struct ath10k_htt_txbuf { struct ath10k_htt_txbuf {
struct htt_data_tx_desc_frag frags[2]; struct htt_data_tx_desc_frag frags[2];
struct ath10k_htc_hdr htc_hdr; struct ath10k_htc_hdr htc_hdr;
......
drivers/net/wireless/ath/ath10k/htt_rx.c
View file @ 85f6d7cf
...@@ -752,22 +752,23 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, ...@@ -752,22 +752,23 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar,
} }
static void ath10k_htt_rx_h_protected(struct ath10k_htt *htt, static void ath10k_htt_rx_h_protected(struct ath10k_htt *htt,
struct htt_rx_info *info, struct ieee80211_rx_status *rx_status,
struct sk_buff *skb,
enum htt_rx_mpdu_encrypt_type enctype) enum htt_rx_mpdu_encrypt_type enctype)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)info->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
if (enctype == HTT_RX_MPDU_ENCRYPT_NONE) { if (enctype == HTT_RX_MPDU_ENCRYPT_NONE) {
info->rx_status.flag &= ~(RX_FLAG_DECRYPTED | rx_status->flag &= ~(RX_FLAG_DECRYPTED |
RX_FLAG_IV_STRIPPED | RX_FLAG_IV_STRIPPED |
RX_FLAG_MMIC_STRIPPED); RX_FLAG_MMIC_STRIPPED);
return; return;
} }
info->rx_status.flag |= RX_FLAG_DECRYPTED | rx_status->flag |= RX_FLAG_DECRYPTED |
RX_FLAG_IV_STRIPPED | RX_FLAG_IV_STRIPPED |
RX_FLAG_MMIC_STRIPPED; RX_FLAG_MMIC_STRIPPED;
hdr->frame_control = __cpu_to_le16(__le16_to_cpu(hdr->frame_control) & hdr->frame_control = __cpu_to_le16(__le16_to_cpu(hdr->frame_control) &
~IEEE80211_FCTL_PROTECTED); ~IEEE80211_FCTL_PROTECTED);
} }
...@@ -792,17 +793,19 @@ static bool ath10k_htt_rx_h_channel(struct ath10k *ar, ...@@ -792,17 +793,19 @@ static bool ath10k_htt_rx_h_channel(struct ath10k *ar,
return true; return true;
} }
static void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info) static void ath10k_process_rx(struct ath10k *ar,
struct ieee80211_rx_status *rx_status,
struct sk_buff *skb)
{ {
struct ieee80211_rx_status *status; struct ieee80211_rx_status *status;
status = IEEE80211_SKB_RXCB(info->skb); status = IEEE80211_SKB_RXCB(skb);
memcpy(status, &info->rx_status, sizeof(*status)); *status = *rx_status;
ath10k_dbg(ATH10K_DBG_DATA, ath10k_dbg(ATH10K_DBG_DATA,
"rx skb %p len %u %s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %imic-err %i\n", "rx skb %p len %u %s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %imic-err %i\n",
info->skb, skb,
info->skb->len, skb->len,
status->flag == 0 ? "legacy" : "", status->flag == 0 ? "legacy" : "",
status->flag & RX_FLAG_HT ? "ht" : "", status->flag & RX_FLAG_HT ? "ht" : "",
status->flag & RX_FLAG_VHT ? "vht" : "", status->flag & RX_FLAG_VHT ? "vht" : "",
...@@ -816,9 +819,9 @@ static void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info) ...@@ -816,9 +819,9 @@ static void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info)
!!(status->flag & RX_FLAG_FAILED_FCS_CRC), !!(status->flag & RX_FLAG_FAILED_FCS_CRC),
!!(status->flag & RX_FLAG_MMIC_ERROR)); !!(status->flag & RX_FLAG_MMIC_ERROR));
ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "rx skb: ", ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "rx skb: ",
info->skb->data, info->skb->len); skb->data, skb->len);
ieee80211_rx(ar->hw, info->skb); ieee80211_rx(ar->hw, skb);
} }
static int ath10k_htt_rx_nwifi_hdrlen(struct ieee80211_hdr *hdr) static int ath10k_htt_rx_nwifi_hdrlen(struct ieee80211_hdr *hdr)
...@@ -828,11 +831,12 @@ static int ath10k_htt_rx_nwifi_hdrlen(struct ieee80211_hdr *hdr) ...@@ -828,11 +831,12 @@ static int ath10k_htt_rx_nwifi_hdrlen(struct ieee80211_hdr *hdr)
} }
static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
struct htt_rx_info *info) struct ieee80211_rx_status *rx_status,
struct sk_buff *skb_in)
{ {
struct htt_rx_desc *rxd; struct htt_rx_desc *rxd;
struct sk_buff *skb = skb_in;
struct sk_buff *first; struct sk_buff *first;
struct sk_buff *skb = info->skb;
enum rx_msdu_decap_format fmt; enum rx_msdu_decap_format fmt;
enum htt_rx_mpdu_encrypt_type enctype; enum htt_rx_mpdu_encrypt_type enctype;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
...@@ -913,26 +917,27 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, ...@@ -913,26 +917,27 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
break; break;
} }
info->skb = skb; skb_in = skb;
ath10k_htt_rx_h_protected(htt, info, enctype); ath10k_htt_rx_h_protected(htt, rx_status, skb_in, enctype);
skb = skb->next; skb = skb->next;
info->skb->next = NULL; skb_in->next = NULL;
if (skb) if (skb)
info->rx_status.flag |= RX_FLAG_AMSDU_MORE; rx_status->flag |= RX_FLAG_AMSDU_MORE;
else else
info->rx_status.flag &= ~RX_FLAG_AMSDU_MORE; rx_status->flag &= ~RX_FLAG_AMSDU_MORE;
ath10k_process_rx(htt->ar, info); ath10k_process_rx(htt->ar, rx_status, skb_in);
} }
/* FIXME: It might be nice to re-assemble the A-MSDU when there's a /* FIXME: It might be nice to re-assemble the A-MSDU when there's a
* monitor interface active for sniffing purposes. */ * monitor interface active for sniffing purposes. */
} }
static void ath10k_htt_rx_msdu(struct ath10k_htt *htt, struct htt_rx_info *info) static void ath10k_htt_rx_msdu(struct ath10k_htt *htt,
struct ieee80211_rx_status *rx_status,
struct sk_buff *skb)
{ {
struct sk_buff *skb = info->skb;
struct htt_rx_desc *rxd; struct htt_rx_desc *rxd;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
enum rx_msdu_decap_format fmt; enum rx_msdu_decap_format fmt;
...@@ -995,10 +1000,9 @@ static void ath10k_htt_rx_msdu(struct ath10k_htt *htt, struct htt_rx_info *info) ...@@ -995,10 +1000,9 @@ static void ath10k_htt_rx_msdu(struct ath10k_htt *htt, struct htt_rx_info *info)
break; break;
} }
info->skb = skb; ath10k_htt_rx_h_protected(htt, rx_status, skb, enctype);
ath10k_htt_rx_h_protected(htt, info, enctype);
ath10k_process_rx(htt->ar, info); ath10k_process_rx(htt->ar, rx_status, skb);
} }
static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb) static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb)
...@@ -1135,7 +1139,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k_htt *htt, ...@@ -1135,7 +1139,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k_htt *htt,
static void ath10k_htt_rx_handler(struct ath10k_htt *htt, static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
struct htt_rx_indication *rx) struct htt_rx_indication *rx)
{ {
struct htt_rx_info info; struct ieee80211_rx_status rx_status;
struct htt_rx_indication_mpdu_range *mpdu_ranges; struct htt_rx_indication_mpdu_range *mpdu_ranges;
struct htt_rx_desc *rxd; struct htt_rx_desc *rxd;
enum htt_rx_mpdu_status status; enum htt_rx_mpdu_status status;
...@@ -1150,7 +1154,7 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, ...@@ -1150,7 +1154,7 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
lockdep_assert_held(&htt->rx_ring.lock); lockdep_assert_held(&htt->rx_ring.lock);
memset(&info, 0, sizeof(info)); memset(&rx_status, 0, sizeof(rx_status));
fw_desc_len = __le16_to_cpu(rx->prefix.fw_rx_desc_bytes); fw_desc_len = __le16_to_cpu(rx->prefix.fw_rx_desc_bytes);
fw_desc = (u8 *)&rx->fw_desc; fw_desc = (u8 *)&rx->fw_desc;
...@@ -1160,24 +1164,23 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, ...@@ -1160,24 +1164,23 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
mpdu_ranges = htt_rx_ind_get_mpdu_ranges(rx); mpdu_ranges = htt_rx_ind_get_mpdu_ranges(rx);
/* Fill this once, while this is per-ppdu */ /* Fill this once, while this is per-ppdu */
info.rx_status.signal = ATH10K_DEFAULT_NOISE_FLOOR; rx_status.signal = ATH10K_DEFAULT_NOISE_FLOOR;
info.rx_status.signal += rx->ppdu.combined_rssi; rx_status.signal += rx->ppdu.combined_rssi;
if (rx->ppdu.info0 & HTT_RX_INDICATION_INFO0_END_VALID) { if (rx->ppdu.info0 & HTT_RX_INDICATION_INFO0_END_VALID) {
/* TSF available only in 32-bit */ /* TSF available only in 32-bit */
info.rx_status.mactime = rx_status.mactime = __le32_to_cpu(rx->ppdu.tsf) & 0xffffffff;
__le32_to_cpu(rx->ppdu.tsf) & 0xffffffff; rx_status.flag |= RX_FLAG_MACTIME_END;
info.rx_status.flag |= RX_FLAG_MACTIME_END;
} }
channel_set = ath10k_htt_rx_h_channel(htt->ar, &info.rx_status); channel_set = ath10k_htt_rx_h_channel(htt->ar, &rx_status);
if (channel_set) { if (channel_set) {
ath10k_htt_rx_h_rates(htt->ar, info.rx_status.band, ath10k_htt_rx_h_rates(htt->ar, rx_status.band,
rx->ppdu.info0, rx->ppdu.info0,
__le32_to_cpu(rx->ppdu.info1), __le32_to_cpu(rx->ppdu.info1),
__le32_to_cpu(rx->ppdu.info2), __le32_to_cpu(rx->ppdu.info2),
&info.rx_status); &rx_status);
} }
ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "htt rx ind: ", ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "htt rx ind: ",
...@@ -1225,24 +1228,22 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, ...@@ -1225,24 +1228,22 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
continue; continue;
} }
info.skb = msdu_head;
if (attention & RX_ATTENTION_FLAGS_FCS_ERR) if (attention & RX_ATTENTION_FLAGS_FCS_ERR)
info.rx_status.flag |= RX_FLAG_FAILED_FCS_CRC; rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
else else
info.rx_status.flag &= ~RX_FLAG_FAILED_FCS_CRC; rx_status.flag &= ~RX_FLAG_FAILED_FCS_CRC;
if (attention & RX_ATTENTION_FLAGS_TKIP_MIC_ERR) if (attention & RX_ATTENTION_FLAGS_TKIP_MIC_ERR)
info.rx_status.flag |= RX_FLAG_MMIC_ERROR; rx_status.flag |= RX_FLAG_MMIC_ERROR;
else else
info.rx_status.flag &= ~RX_FLAG_MMIC_ERROR; rx_status.flag &= ~RX_FLAG_MMIC_ERROR;
hdr = ath10k_htt_rx_skb_get_hdr(msdu_head); hdr = ath10k_htt_rx_skb_get_hdr(msdu_head);
if (ath10k_htt_rx_hdr_is_amsdu(hdr)) if (ath10k_htt_rx_hdr_is_amsdu(hdr))
ath10k_htt_rx_amsdu(htt, &info); ath10k_htt_rx_amsdu(htt, &rx_status, msdu_head);
else else
ath10k_htt_rx_msdu(htt, &info); ath10k_htt_rx_msdu(htt, &rx_status, msdu_head);
} }
} }
...@@ -1256,7 +1257,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, ...@@ -1256,7 +1257,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
enum htt_rx_mpdu_encrypt_type enctype; enum htt_rx_mpdu_encrypt_type enctype;
struct htt_rx_desc *rxd; struct htt_rx_desc *rxd;
enum rx_msdu_decap_format fmt; enum rx_msdu_decap_format fmt;
struct htt_rx_info info = {}; struct ieee80211_rx_status rx_status = {};
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
int ret; int ret;
bool tkip_mic_err; bool tkip_mic_err;
...@@ -1302,18 +1303,17 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, ...@@ -1302,18 +1303,17 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
goto end; goto end;
} }
info.skb = msdu_head;
enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0), enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0),
RX_MPDU_START_INFO0_ENCRYPT_TYPE); RX_MPDU_START_INFO0_ENCRYPT_TYPE);
ath10k_htt_rx_h_protected(htt, &info, enctype); ath10k_htt_rx_h_protected(htt, &rx_status, msdu_head, enctype);
info.skb->ip_summed = ath10k_htt_rx_get_csum_state(info.skb); msdu_head->ip_summed = ath10k_htt_rx_get_csum_state(msdu_head);
if (tkip_mic_err) if (tkip_mic_err)
ath10k_warn("tkip mic error\n"); ath10k_warn("tkip mic error\n");
if (decrypt_err) { if (decrypt_err) {
ath10k_warn("decryption err in fragmented rx\n"); ath10k_warn("decryption err in fragmented rx\n");
dev_kfree_skb_any(info.skb); dev_kfree_skb_any(msdu_head);
goto end; goto end;
} }
...@@ -1322,11 +1322,11 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, ...@@ -1322,11 +1322,11 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
paramlen = ath10k_htt_rx_crypto_param_len(enctype); paramlen = ath10k_htt_rx_crypto_param_len(enctype);
/* It is more efficient to move the header than the payload */ /* It is more efficient to move the header than the payload */
memmove((void *)info.skb->data + paramlen, memmove((void *)msdu_head->data + paramlen,
(void *)info.skb->data, (void *)msdu_head->data,
hdrlen); hdrlen);
skb_pull(info.skb, paramlen); skb_pull(msdu_head, paramlen);
hdr = (struct ieee80211_hdr *)info.skb->data; hdr = (struct ieee80211_hdr *)msdu_head->data;
} }
/* remove trailing FCS */ /* remove trailing FCS */
...@@ -1340,17 +1340,17 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, ...@@ -1340,17 +1340,17 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA) enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)
trim += 8; trim += 8;
if (trim > info.skb->len) { if (trim > msdu_head->len) {
ath10k_warn("htt rx fragment: trailer longer than the frame itself? drop\n"); ath10k_warn("htt rx fragment: trailer longer than the frame itself? drop\n");
dev_kfree_skb_any(info.skb); dev_kfree_skb_any(msdu_head);
goto end; goto end;
} }
skb_trim(info.skb, info.skb->len - trim); skb_trim(msdu_head, msdu_head->len - trim);
ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "htt rx frag mpdu: ", ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "htt rx frag mpdu: ",
info.skb->data, info.skb->len); msdu_head->data, msdu_head->len);
ath10k_process_rx(htt->ar, &info); ath10k_process_rx(htt->ar, &rx_status, msdu_head);
end: end:
if (fw_desc_len > 0) { if (fw_desc_len > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7