| Message ID | 1560336554-14420-1-git-send-email-mkenna@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4c2da40244db1b3cf28c23443dddc4a9aa0cfde6 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN | expand |
Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote: > Removed the macro MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN > in the ath11k_dp_rx_h_undecap_raw() in dp_rx.c. > > Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath11k-bringup branch of ath.git, thanks. 4c2da40244db ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 84e4dd147ff0..d68db3f57200 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -1453,8 +1453,6 @@ static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, ether_addr_copy(ieee80211_get_SA(hdr), sa); } -#define MICHAEL_MIC_LEN 8 - static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu, enum hal_encrypt_type enctype, struct ieee80211_rx_status *status, @@ -1501,7 +1499,7 @@ static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu, if ((status->flag & RX_FLAG_MMIC_STRIPPED) && !ieee80211_has_morefrags(hdr->frame_control) && enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) - skb_trim(msdu, msdu->len - MICHAEL_MIC_LEN); + skb_trim(msdu, msdu->len - IEEE80211_CCMP_MIC_LEN); /* Head */ if (status->flag & RX_FLAG_IV_STRIPPED) {
Removed the macro MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN in the ath11k_dp_rx_h_undecap_raw() in dp_rx.c. Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> --- drivers/net/wireless/ath/ath11k/dp_rx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)