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

Commit 71fca6e9 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove ATH9K_CAP_TKIP_MIC 



TKIP MIC support is always enabled anyway.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9cc3271f

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+0 −8
Original line number Diff line number Diff line
@@ -570,14 +570,6 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv) 
	for (i = 0; i < common->keymax; i++)

		ath9k_hw_keyreset(priv->ah, (u16) i);



	/*

	 * Whether we should enable h/w TKIP MIC.

	 * XXX: if we don't support WME TKIP MIC, then we wouldn't

	 * report WMM capable, so it's always safe to turn on

	 * TKIP MIC in this case.

	 */

	ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);



	/*

	 * Check whether the separate key cache entries

	 * are required to handle both tx+rx MIC keys.

drivers/net/wireless/ath/ath9k/hw.c

+0 −17
Original line number Diff line number Diff line
@@ -2259,15 +2259,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
			    u32 capability, u32 *result)

{

	switch (type) {

	case ATH9K_CAP_TKIP_MIC:

		switch (capability) {

		case 0:

			return true;

		case 1:

			return (ah->sta_id1_defaults &

				AR_STA_ID1_CRPT_MIC_ENABLE) ? true :

			false;

		}

	case ATH9K_CAP_TKIP_SPLIT:

		return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?

			false : true;
@@ -2299,14 +2290,6 @@ bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
			    u32 capability, u32 setting, int *status)

{

	switch (type) {

	case ATH9K_CAP_TKIP_MIC:

		if (setting)

			ah->sta_id1_defaults |=

				AR_STA_ID1_CRPT_MIC_ENABLE;

		else

			ah->sta_id1_defaults &=

				~AR_STA_ID1_CRPT_MIC_ENABLE;

		return true;

	case ATH9K_CAP_MCAST_KEYSRCH:

		if (setting)

			ah->sta_id1_defaults |= AR_STA_ID1_MCAST_KSRCH;

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ enum ath9k_hw_caps { 
};



enum ath9k_capability_type {

	ATH9K_CAP_TKIP_MIC,

	ATH9K_CAP_TKIP_SPLIT,

	ATH9K_CAP_MCAST_KEYSRCH,

	ATH9K_CAP_DS

drivers/net/wireless/ath/ath9k/init.c

+0 −8
Original line number Diff line number Diff line
@@ -379,14 +379,6 @@ static void ath9k_init_crypto(struct ath_softc *sc) 
	for (i = 0; i < common->keymax; i++)

		ath9k_hw_keyreset(sc->sc_ah, (u16) i);



	/*

	 * Whether we should enable h/w TKIP MIC.

	 * XXX: if we don't support WME TKIP MIC, then we wouldn't

	 * report WMM capable, so it's always safe to turn on

	 * TKIP MIC in this case.

	 */

	ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);



	/*

	 * Check whether the separate key cache entries

	 * are required to handle both tx+rx MIC keys.