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

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

ath9k_hw: remove ATH9K_CAP_TKIP_SPLIT 



This is only used as a workaround for an issue in one specific hw revision.

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

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

+0 −9
Original line number Diff line number Diff line
@@ -570,15 +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);



	/*

	 * Check whether the separate key cache entries

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

	 * With split mic keys the number of stations is limited

	 * to 27 otherwise 59.

	 */

	if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT, 0, NULL))

		common->splitmic = 1;



	/* turn on mcast key search if possible */

	if (!ath9k_hw_getcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))

		(void)ath9k_hw_setcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH,

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

+0 −3
Original line number Diff line number Diff line
@@ -2259,9 +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_SPLIT:

		return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?

			false : true;

	case ATH9K_CAP_MCAST_KEYSRCH:

		switch (capability) {

		case 0:

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_SPLIT,

	ATH9K_CAP_MCAST_KEYSRCH,

	ATH9K_CAP_DS

};

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

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static void ath9k_init_crypto(struct ath_softc *sc) 
	 * With split mic keys the number of stations is limited

	 * to 27 otherwise 59.

	 */

	if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT, 0, NULL))

	if (!(sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA))

		common->splitmic = 1;



	/* turn on mcast key search if possible */