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

Commit 97359d12 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: use cipher suite selectors 



Currently, mac80211 translates the cfg80211
cipher suite selectors into ALG_* values.
That isn't all too useful, and some drivers
benefit from the distinction between WEP40
and WEP104 as well. Therefore, convert it
all to use the cipher suite selectors.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 915a824e

drivers/net/wireless/at76c50x-usb.c

+4 −3
Original line number Diff line number Diff line
@@ -2061,11 +2061,12 @@ static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	int i;



	at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "

	at76_dbg(DBG_MAC80211, "%s(): cmd %d key->cipher %d key->keyidx %d "

		 "key->keylen %d",

		 __func__, cmd, key->alg, key->keyidx, key->keylen);

		 __func__, cmd, key->cipher, key->keyidx, key->keylen);



	if (key->alg != ALG_WEP)

	if ((key->cipher != WLAN_CIPHER_SUITE_WEP40) &&

	    (key->cipher != WLAN_CIPHER_SUITE_WEP104))

		return -EOPNOTSUPP;



	key->hw_key_idx = key->keyidx;

drivers/net/wireless/ath/ar9170/main.c

+15 −16
Original line number Diff line number Diff line
@@ -1190,14 +1190,13 @@ static int ar9170_tx_prepare(struct ar9170 *ar, struct sk_buff *skb) 
	if (info->control.hw_key) {

		icv = info->control.hw_key->icv_len;



		switch (info->control.hw_key->alg) {

		case ALG_WEP:

		switch (info->control.hw_key->cipher) {

		case WLAN_CIPHER_SUITE_WEP40:

		case WLAN_CIPHER_SUITE_WEP104:

		case WLAN_CIPHER_SUITE_TKIP:

			keytype = AR9170_TX_MAC_ENCR_RC4;

			break;

		case ALG_TKIP:

			keytype = AR9170_TX_MAC_ENCR_RC4;

			break;

		case ALG_CCMP:

		case WLAN_CIPHER_SUITE_CCMP:

			keytype = AR9170_TX_MAC_ENCR_AES;

			break;

		default:
@@ -1778,17 +1777,17 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	if ((!ar->vif) || (ar->disable_offload))

		return -EOPNOTSUPP;



	switch (key->alg) {

	case ALG_WEP:

		if (key->keylen == WLAN_KEY_LEN_WEP40)

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		ktype = AR9170_ENC_ALG_WEP64;

		else

		break;

	case WLAN_CIPHER_SUITE_WEP104:

		ktype = AR9170_ENC_ALG_WEP128;

		break;

	case ALG_TKIP:

	case WLAN_CIPHER_SUITE_TKIP:

		ktype = AR9170_ENC_ALG_TKIP;

		break;

	case ALG_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

		ktype = AR9170_ENC_ALG_AESCCMP;

		break;

	default:
@@ -1827,7 +1826,7 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		if (err)

			goto out;



		if (key->alg == ALG_TKIP) {

		if (key->cipher == WLAN_CIPHER_SUITE_TKIP) {

			err = ar9170_upload_key(ar, i, sta ? sta->addr : NULL,

						ktype, 1, key->key + 16, 16);

			if (err)
@@ -1864,7 +1863,7 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			if (err)

				goto out;



			if (key->alg == ALG_TKIP) {

			if (key->cipher == WLAN_CIPHER_SUITE_TKIP) {

				err = ar9170_upload_key(ar, key->hw_key_idx,

							NULL,

							AR9170_ENC_ALG_NONE, 1,

drivers/net/wireless/ath/ath5k/base.c

+5 −4
Original line number Diff line number Diff line
@@ -3297,11 +3297,12 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	if (sc->opmode == NL80211_IFTYPE_AP)

		return -EOPNOTSUPP;



	switch (key->alg) {

	case ALG_WEP:

	case ALG_TKIP:

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_TKIP:

		break;

	case ALG_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

		if (sc->ah->ah_aes_support)

			break;

drivers/net/wireless/ath/ath5k/pcu.c

+8 −11
Original line number Diff line number Diff line
@@ -695,21 +695,18 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry) 
static

int ath5k_keycache_type(const struct ieee80211_key_conf *key)

{

	switch (key->alg) {

	case ALG_TKIP:

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_TKIP:

		return AR5K_KEYTABLE_TYPE_TKIP;

	case ALG_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

		return AR5K_KEYTABLE_TYPE_CCM;

	case ALG_WEP:

		if (key->keylen == WLAN_KEY_LEN_WEP40)

	case WLAN_CIPHER_SUITE_WEP40:

		return AR5K_KEYTABLE_TYPE_40;

		else if (key->keylen == WLAN_KEY_LEN_WEP104)

	case WLAN_CIPHER_SUITE_WEP104:

		return AR5K_KEYTABLE_TYPE_104;

		return -EINVAL;

	default:

		return -EINVAL;

	}

	return -EINVAL;

}



/*
@@ -728,7 +725,7 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry, 
	bool is_tkip;

	const u8 *key_ptr;



	is_tkip = (key->alg == ALG_TKIP);

	is_tkip = (key->cipher == WLAN_CIPHER_SUITE_TKIP);



	/*

	 * key->keylen comes in from mac80211 in bytes.

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

+21 −15
Original line number Diff line number Diff line
@@ -46,12 +46,17 @@ int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb) 
	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);



	if (tx_info->control.hw_key) {

		if (tx_info->control.hw_key->alg == ALG_WEP)

		switch (tx_info->control.hw_key->cipher) {

		case WLAN_CIPHER_SUITE_WEP40:

		case WLAN_CIPHER_SUITE_WEP104:

			return ATH9K_KEY_TYPE_WEP;

		else if (tx_info->control.hw_key->alg == ALG_TKIP)

		case WLAN_CIPHER_SUITE_TKIP:

			return ATH9K_KEY_TYPE_TKIP;

		else if (tx_info->control.hw_key->alg == ALG_CCMP)

		case WLAN_CIPHER_SUITE_CCMP:

			return ATH9K_KEY_TYPE_AES;

		default:

			break;

		}

	}



	return ATH9K_KEY_TYPE_CLEAR;
@@ -212,11 +217,11 @@ static int ath_reserve_key_cache_slot_tkip(struct ath_common *common) 
}



static int ath_reserve_key_cache_slot(struct ath_common *common,

				      enum ieee80211_key_alg alg)

				      u32 cipher)

{

	int i;



	if (alg == ALG_TKIP)

	if (cipher == WLAN_CIPHER_SUITE_TKIP)

		return ath_reserve_key_cache_slot_tkip(common);



	/* First, try to find slots that would not be available for TKIP. */
@@ -293,14 +298,15 @@ int ath9k_cmn_key_config(struct ath_common *common, 


	memset(&hk, 0, sizeof(hk));



	switch (key->alg) {

	case ALG_WEP:

	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

		hk.kv_type = ATH9K_CIPHER_WEP;

		break;

	case ALG_TKIP:

	case WLAN_CIPHER_SUITE_TKIP:

		hk.kv_type = ATH9K_CIPHER_TKIP;

		break;

	case ALG_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

		hk.kv_type = ATH9K_CIPHER_AES_CCM;

		break;

	default:
@@ -316,7 +322,7 @@ int ath9k_cmn_key_config(struct ath_common *common, 
			memcpy(gmac, vif->addr, ETH_ALEN);

			gmac[0] |= 0x01;

			mac = gmac;

			idx = ath_reserve_key_cache_slot(common, key->alg);

			idx = ath_reserve_key_cache_slot(common, key->cipher);

			break;

		case NL80211_IFTYPE_ADHOC:

			if (!sta) {
@@ -326,7 +332,7 @@ int ath9k_cmn_key_config(struct ath_common *common, 
			memcpy(gmac, sta->addr, ETH_ALEN);

			gmac[0] |= 0x01;

			mac = gmac;

			idx = ath_reserve_key_cache_slot(common, key->alg);

			idx = ath_reserve_key_cache_slot(common, key->cipher);

			break;

		default:

			idx = key->keyidx;
@@ -348,13 +354,13 @@ int ath9k_cmn_key_config(struct ath_common *common, 
			return -EOPNOTSUPP;

		mac = sta->addr;



		idx = ath_reserve_key_cache_slot(common, key->alg);

		idx = ath_reserve_key_cache_slot(common, key->cipher);

	}



	if (idx < 0)

		return -ENOSPC; /* no free key cache entries */



	if (key->alg == ALG_TKIP)

	if (key->cipher == WLAN_CIPHER_SUITE_TKIP)

		ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,

				      vif->type == NL80211_IFTYPE_AP);

	else
@@ -364,7 +370,7 @@ int ath9k_cmn_key_config(struct ath_common *common, 
		return -EIO;



	set_bit(idx, common->keymap);

	if (key->alg == ALG_TKIP) {

	if (key->cipher == WLAN_CIPHER_SUITE_TKIP) {

		set_bit(idx + 64, common->keymap);

		if (common->splitmic) {

			set_bit(idx + 32, common->keymap);
@@ -389,7 +395,7 @@ void ath9k_cmn_key_delete(struct ath_common *common, 
		return;



	clear_bit(key->hw_key_idx, common->keymap);

	if (key->alg != ALG_TKIP)

	if (key->cipher != WLAN_CIPHER_SUITE_TKIP)

		return;



	clear_bit(key->hw_key_idx + 64, common->keymap);