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

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

ath9k_hw: remove ATH9K_CAP_CIPHER 



All of the ciphers that are tested for are always supported

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

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

+8 −16
Original line number Diff line number Diff line
@@ -570,8 +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);



	if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,

				   ATH9K_CIPHER_TKIP, NULL)) {

	/*

	 * Whether we should enable h/w TKIP MIC.

	 * XXX: if we don't support WME TKIP MIC, then we wouldn't
@@ -579,7 +577,6 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv) 
	 * TKIP MIC in this case.

	 */

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

	}



	/*

	 * Check whether the separate key cache entries
@@ -587,12 +584,7 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv) 
	 * With split mic keys the number of stations is limited

	 * to 27 otherwise 59.

	 */

	if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,

				   ATH9K_CIPHER_TKIP, NULL)

	    && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,

				      ATH9K_CIPHER_MIC, NULL)

	    && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT,

				      0, NULL))

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

		common->splitmic = 1;



	/* turn on mcast key search if possible */

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

+0 −12
Original line number Diff line number Diff line
@@ -2260,18 +2260,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
{

	struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);

	switch (type) {

	case ATH9K_CAP_CIPHER:

		switch (capability) {

		case ATH9K_CIPHER_AES_CCM:

		case ATH9K_CIPHER_AES_OCB:

		case ATH9K_CIPHER_TKIP:

		case ATH9K_CIPHER_WEP:

		case ATH9K_CIPHER_MIC:

		case ATH9K_CIPHER_CLR:

			return true;

		default:

			return false;

		}

	case ATH9K_CAP_TKIP_MIC:

		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_CIPHER = 0,

	ATH9K_CAP_TKIP_MIC,

	ATH9K_CAP_TKIP_SPLIT,

	ATH9K_CAP_TXPOW,

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

+8 −16
Original line number Diff line number Diff line
@@ -379,8 +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);



	if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,

				   ATH9K_CIPHER_TKIP, NULL)) {

	/*

	 * Whether we should enable h/w TKIP MIC.

	 * XXX: if we don't support WME TKIP MIC, then we wouldn't
@@ -388,7 +386,6 @@ static void ath9k_init_crypto(struct ath_softc *sc) 
	 * 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
@@ -396,12 +393,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_CIPHER,

				   ATH9K_CIPHER_TKIP, NULL)

	    && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,

				      ATH9K_CIPHER_MIC, NULL)

	    && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT,

				      0, NULL))

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

		common->splitmic = 1;



	/* turn on mcast key search if possible */