Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 890d3b2a authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: use ieee80211 defines for crypto param lengths 



Use the globally defined ieee80211 values instead
of re-defining them in the driver again.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 10ac1ce8

drivers/net/wireless/ath/ath10k/htt_rx.c

+20 −14
Original line number Diff line number Diff line
@@ -588,41 +588,47 @@ static int ath10k_htt_rx_crypto_param_len(struct ath10k *ar, 
					  enum htt_rx_mpdu_encrypt_type type)

{

	switch (type) {

	case HTT_RX_MPDU_ENCRYPT_NONE:

		return 0;

	case HTT_RX_MPDU_ENCRYPT_WEP40:

	case HTT_RX_MPDU_ENCRYPT_WEP104:

		return 4;

		return IEEE80211_WEP_IV_LEN;

	case HTT_RX_MPDU_ENCRYPT_TKIP_WITHOUT_MIC:

	case HTT_RX_MPDU_ENCRYPT_WEP128: /* not tested */

	case HTT_RX_MPDU_ENCRYPT_TKIP_WPA:

	case HTT_RX_MPDU_ENCRYPT_WAPI: /* not tested */

		return IEEE80211_TKIP_IV_LEN;

	case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2:

		return 8;

	case HTT_RX_MPDU_ENCRYPT_NONE:

		return 0;

		return IEEE80211_CCMP_HDR_LEN;

	case HTT_RX_MPDU_ENCRYPT_WEP128:

	case HTT_RX_MPDU_ENCRYPT_WAPI:

		break;

	}



	ath10k_warn(ar, "unknown encryption type %d\n", type);

	ath10k_warn(ar, "unsupported encryption type %d\n", type);

	return 0;

}



#define MICHAEL_MIC_LEN 8



static int ath10k_htt_rx_crypto_tail_len(struct ath10k *ar,

					 enum htt_rx_mpdu_encrypt_type type)

{

	switch (type) {

	case HTT_RX_MPDU_ENCRYPT_NONE:

		return 0;

	case HTT_RX_MPDU_ENCRYPT_WEP40:

	case HTT_RX_MPDU_ENCRYPT_WEP104:

	case HTT_RX_MPDU_ENCRYPT_WEP128:

	case HTT_RX_MPDU_ENCRYPT_WAPI:

		return 0;

		return IEEE80211_WEP_ICV_LEN;

	case HTT_RX_MPDU_ENCRYPT_TKIP_WITHOUT_MIC:

	case HTT_RX_MPDU_ENCRYPT_TKIP_WPA:

		return 4;

		return IEEE80211_TKIP_ICV_LEN;

	case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2:

		return 8;

		return IEEE80211_CCMP_MIC_LEN;

	case HTT_RX_MPDU_ENCRYPT_WEP128:

	case HTT_RX_MPDU_ENCRYPT_WAPI:

		break;

	}



	ath10k_warn(ar, "unknown encryption type %d\n", type);

	ath10k_warn(ar, "unsupported encryption type %d\n", type);

	return 0;

}
@@ -1427,7 +1433,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, 
	/* last fragment of TKIP frags has MIC */

	if (!ieee80211_has_morefrags(hdr->frame_control) &&

	    enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)

		trim += 8;

		trim += MICHAEL_MIC_LEN;



	if (trim > msdu_head->len) {

		ath10k_warn(ar, "htt rx fragment: trailer longer than the frame itself? drop\n");