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

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

ath9k_hw: remove useless hw capability flags 



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

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

+1 −2
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ static void ath9k_init_misc(struct ath9k_htc_priv *priv) 
	common->tx_chainmask = priv->ah->caps.tx_chainmask;

	common->rx_chainmask = priv->ah->caps.rx_chainmask;



	if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)

	memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);



	priv->ah->opmode = NL80211_IFTYPE_STATION;

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

+1 −2
Original line number Diff line number Diff line
@@ -415,7 +415,6 @@ static void ath9k_htc_opmode_init(struct ath9k_htc_priv *priv) 
	ath9k_hw_setrxfilter(ah, rfilt);



	/* configure bssid mask */

	if (ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)

	ath_hw_setbssidmask(common);



	/* configure operational mode */

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

+0 −21
Original line number Diff line number Diff line
@@ -1574,12 +1574,6 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry, 
		keyType = AR_KEYTABLE_TYPE_AES;

		break;

	case ATH9K_CIPHER_AES_CCM:

		if (!(pCap->hw_caps & ATH9K_HW_CAP_CIPHER_AESCCM)) {

			ath_print(common, ATH_DBG_ANY,

				  "AES-CCM not supported by mac rev 0x%x\n",

				  ah->hw_version.macRev);

			return false;

		}

		keyType = AR_KEYTABLE_TYPE_CCM;

		break;

	case ATH9K_CIPHER_TKIP:
@@ -2143,24 +2137,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	pCap->low_5ghz_chan = 4920;

	pCap->high_5ghz_chan = 6100;



	pCap->hw_caps &= ~ATH9K_HW_CAP_CIPHER_CKIP;

	pCap->hw_caps |= ATH9K_HW_CAP_CIPHER_TKIP;

	pCap->hw_caps |= ATH9K_HW_CAP_CIPHER_AESCCM;



	pCap->hw_caps &= ~ATH9K_HW_CAP_MIC_CKIP;

	pCap->hw_caps |= ATH9K_HW_CAP_MIC_TKIP;

	pCap->hw_caps |= ATH9K_HW_CAP_MIC_AESCCM;



	if (ah->config.ht_enable)

		pCap->hw_caps |= ATH9K_HW_CAP_HT;

	else

		pCap->hw_caps &= ~ATH9K_HW_CAP_HT;



	pCap->hw_caps |= ATH9K_HW_CAP_GTT;

	pCap->hw_caps |= ATH9K_HW_CAP_VEOL;

	pCap->hw_caps |= ATH9K_HW_CAP_BSSIDMASK;

	pCap->hw_caps &= ~ATH9K_HW_CAP_MCAST_KEYSEARCH;



	if (capField & AR_EEPROM_EEPCAP_MAXQCU)

		pCap->total_queues =

			MS(capField, AR_EEPROM_EEPCAP_MAXQCU);
@@ -2173,8 +2154,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	else

		pCap->keycache_size = AR_KEYTABLE_SIZE;



	pCap->hw_caps |= ATH9K_HW_CAP_FASTCC;



	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))

		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;

	else

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

+13 −24
Original line number Diff line number Diff line
@@ -181,30 +181,19 @@ enum wireless_mode { 
};



enum ath9k_hw_caps {

	ATH9K_HW_CAP_MIC_AESCCM                 = BIT(0),

	ATH9K_HW_CAP_MIC_CKIP                   = BIT(1),

	ATH9K_HW_CAP_MIC_TKIP                   = BIT(2),

	ATH9K_HW_CAP_CIPHER_AESCCM              = BIT(3),

	ATH9K_HW_CAP_CIPHER_CKIP                = BIT(4),

	ATH9K_HW_CAP_CIPHER_TKIP                = BIT(5),

	ATH9K_HW_CAP_VEOL                       = BIT(6),

	ATH9K_HW_CAP_BSSIDMASK                  = BIT(7),

	ATH9K_HW_CAP_MCAST_KEYSEARCH            = BIT(8),

	ATH9K_HW_CAP_HT                         = BIT(9),

	ATH9K_HW_CAP_GTT                        = BIT(10),

	ATH9K_HW_CAP_FASTCC                     = BIT(11),

	ATH9K_HW_CAP_RFSILENT                   = BIT(12),

	ATH9K_HW_CAP_CST                        = BIT(13),

	ATH9K_HW_CAP_ENHANCEDPM                 = BIT(14),

	ATH9K_HW_CAP_AUTOSLEEP                  = BIT(15),

	ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(16),

	ATH9K_HW_CAP_EDMA			= BIT(17),

	ATH9K_HW_CAP_RAC_SUPPORTED		= BIT(18),

	ATH9K_HW_CAP_LDPC			= BIT(19),

	ATH9K_HW_CAP_FASTCLOCK			= BIT(20),

	ATH9K_HW_CAP_SGI_20			= BIT(21),

	ATH9K_HW_CAP_PAPRD			= BIT(22),

	ATH9K_HW_CAP_ANT_DIV_COMB		= BIT(23),

	ATH9K_HW_CAP_HT                         = BIT(0),

	ATH9K_HW_CAP_RFSILENT                   = BIT(1),

	ATH9K_HW_CAP_CST                        = BIT(2),

	ATH9K_HW_CAP_ENHANCEDPM                 = BIT(3),

	ATH9K_HW_CAP_AUTOSLEEP                  = BIT(4),

	ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(5),

	ATH9K_HW_CAP_EDMA			= BIT(6),

	ATH9K_HW_CAP_RAC_SUPPORTED		= BIT(7),

	ATH9K_HW_CAP_LDPC			= BIT(8),

	ATH9K_HW_CAP_FASTCLOCK			= BIT(9),

	ATH9K_HW_CAP_SGI_20			= BIT(10),

	ATH9K_HW_CAP_PAPRD			= BIT(11),

	ATH9K_HW_CAP_ANT_DIV_COMB		= BIT(12),

};



struct ath9k_hw_capabilities {

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

+1 −2
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ static void ath9k_init_misc(struct ath_softc *sc) 
	ath9k_hw_set_diversity(sc->sc_ah, true);

	sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah);



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)

	memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);



	sc->beacon.slottime = ATH9K_SLOT_TIME_9;