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

Commit 0d467502 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] wireless/atmel: fix setting TX key only in ENCODEEXT 



The previous patch that added ENCODEEXT and AUTH support to the atmel
driver contained a slight error which would cause just setting the TX
key index to also set the encryption key again.  This patch allows any
combination of setting the TX key index and setting an encryption key.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ab479995

drivers/net/wireless/atmel.c

+32 −29
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ static int atmel_set_encodeext(struct net_device *dev, 
	struct atmel_private *priv = netdev_priv(dev);

	struct iw_point *encoding = &wrqu->encoding;

	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

	int idx, key_len;

	int idx, key_len, alg = ext->alg, set_key = 1;



	/* Determine and validate the key index */

	idx = encoding->flags & IW_ENCODE_INDEX;
@@ -1883,19 +1883,21 @@ static int atmel_set_encodeext(struct net_device *dev, 
	} else

		idx = priv->default_key;



	if ((encoding->flags & IW_ENCODE_DISABLED) ||

	    ext->alg == IW_ENCODE_ALG_NONE) {

		priv->wep_is_on = 0;

		priv->encryption_level = 0;

		priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;

	}

	if (encoding->flags & IW_ENCODE_DISABLED)

	    alg = IW_ENCODE_ALG_NONE;



	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)

	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {

		priv->default_key = idx;

		set_key = ext->key_len > 0 ? 1 : 0;

	}



	/* Set the requested key */

	switch (ext->alg) {

	if (set_key) {

		/* Set the requested key first */

		switch (alg) {

		case IW_ENCODE_ALG_NONE:

			priv->wep_is_on = 0;

			priv->encryption_level = 0;

			priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;

			break;

		case IW_ENCODE_ALG_WEP:

			if (ext->key_len > 5) {
@@ -1917,6 +1919,7 @@ static int atmel_set_encodeext(struct net_device *dev, 
		default:

			return -EINVAL;

		}

	}



	return -EINPROGRESS;

}