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

Commit 1443b653 authored by Dan Williams's avatar Dan Williams Committed by David S. Miller
Browse files

[PATCH] libertas: rename WLAN_802_11_KEY to enc_key and clean up usage 



It doesn't touch hardware and therefore doesn't need endian notations
either.

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

drivers/net/wireless/libertas/assoc.c

+4 −4
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int assoc_helper_wep_keys(wlan_private *priv, 
	/* Copy WEP keys into adapter wep key fields */

	for (i = 0; i < 4; i++) {

		memcpy(&adapter->wep_keys[i], &assoc_req->wep_keys[i],

			sizeof(struct WLAN_802_11_KEY));

			sizeof(struct enc_key));

	}

	adapter->wep_tx_keyidx = assoc_req->wep_tx_keyidx;
@@ -703,7 +703,7 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter) 
		int i;

		for (i = 0; i < 4; i++) {

			memcpy(&assoc_req->wep_keys[i], &adapter->wep_keys[i],

				sizeof(struct WLAN_802_11_KEY));

				sizeof(struct enc_key));

		}

	}
@@ -712,12 +712,12 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter) 


	if (!test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {

		memcpy(&assoc_req->wpa_mcast_key, &adapter->wpa_mcast_key,

			sizeof(struct WLAN_802_11_KEY));

			sizeof(struct enc_key));

	}



	if (!test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {

		memcpy(&assoc_req->wpa_unicast_key, &adapter->wpa_unicast_key,

			sizeof(struct WLAN_802_11_KEY));

			sizeof(struct enc_key));

	}



	if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {

drivers/net/wireless/libertas/cmd.c

+3 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv, 


		/* Copy key types and material to host command structure */

		for (i = 0; i < 4; i++) {

			struct WLAN_802_11_KEY * pkey = &assoc_req->wep_keys[i];

			struct enc_key * pkey = &assoc_req->wep_keys[i];



			switch (pkey->len) {

			case KEY_LEN_WEP_40:
@@ -249,10 +249,8 @@ static int wlan_cmd_802_11_enable_rsn(wlan_private * priv, 




static void set_one_wpa_key(struct MrvlIEtype_keyParamSet * pkeyparamset,

                            struct WLAN_802_11_KEY * pkey)

                            struct enc_key * pkey)

{

	pkeyparamset->keytypeid = cpu_to_le16(pkey->type);



	if (pkey->flags & KEY_INFO_WPA_ENABLED) {

		pkeyparamset->keyinfo |= cpu_to_le16(KEY_INFO_WPA_ENABLED);

	}
@@ -264,6 +262,7 @@ static void set_one_wpa_key(struct MrvlIEtype_keyParamSet * pkeyparamset, 
	}



	pkeyparamset->type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);

	pkeyparamset->keytypeid = cpu_to_le16(pkey->type);

	pkeyparamset->keylen = cpu_to_le16(pkey->len);

	memcpy(pkeyparamset->key, pkey->key, pkey->len);

	pkeyparamset->length = cpu_to_le16(  sizeof(pkeyparamset->keytypeid)

drivers/net/wireless/libertas/cmdresp.c

+10 −9
Original line number Diff line number Diff line
@@ -321,11 +321,12 @@ static int wlan_ret_802_11_key_material(wlan_private * priv, 
		while (buf_ptr < resp_end) {

			struct MrvlIEtype_keyParamSet * pkeyparamset =

			    (struct MrvlIEtype_keyParamSet *) buf_ptr;

			struct WLAN_802_11_KEY * pkey;

			u16 key_info = le16_to_cpu(pkeyparamset->keyinfo);

			struct enc_key * pkey;

			u16 param_set_len = le16_to_cpu(pkeyparamset->length);

			u8 * end;

			u16 key_len = le16_to_cpu(pkeyparamset->keylen);

			u16 key_flags = le16_to_cpu(pkeyparamset->keyinfo);

			u16 key_type = le16_to_cpu(pkeyparamset->keytypeid);

			u8 * end;



			end = (u8 *) pkeyparamset + sizeof (pkeyparamset->type)

			                          + sizeof (pkeyparamset->length)
@@ -334,20 +335,20 @@ static int wlan_ret_802_11_key_material(wlan_private * priv, 
			if (end > resp_end)

				break;



			if (key_info & KEY_INFO_WPA_UNICAST)

			if (key_flags & KEY_INFO_WPA_UNICAST)

				pkey = &adapter->wpa_unicast_key;

			else if (key_info & KEY_INFO_WPA_MCAST)

			else if (key_flags & KEY_INFO_WPA_MCAST)

				pkey = &adapter->wpa_mcast_key;

			else

				break;



			/* Copy returned key into driver */

			memset(pkey, 0, sizeof(struct WLAN_802_11_KEY));

			memset(pkey, 0, sizeof(struct enc_key));

			if (key_len > sizeof(pkey->key))

				break;

			pkey->type = le16_to_cpu(pkeyparamset->keytypeid);

			pkey->flags = le16_to_cpu(pkeyparamset->keyinfo);

			pkey->len = le16_to_cpu(pkeyparamset->keylen);

			pkey->type = key_type;

			pkey->flags = key_flags;

			pkey->len = key_len;

			memcpy(pkey->key, pkeyparamset->key, pkey->len);



			buf_ptr = end + 1;

drivers/net/wireless/libertas/defs.h

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ static inline void lbs_dbg_hex(char *prompt, u8 * buf, int len) 
#define	CMD_F_HOSTCMD		(1 << 0)

#define FW_CAPINFO_WPA  	(1 << 0)



/** WPA key LENGTH*/

#define MRVL_MAX_KEY_WPA_KEY_LENGTH     32



#define KEY_LEN_WPA_AES			16

#define KEY_LEN_WPA_TKIP		32

#define KEY_LEN_WEP_104			13

drivers/net/wireless/libertas/dev.h

+6 −6
Original line number Diff line number Diff line
@@ -188,12 +188,12 @@ struct assoc_request { 
	u8 bssid[ETH_ALEN];



	/** WEP keys */

	struct WLAN_802_11_KEY wep_keys[4];

	struct enc_key wep_keys[4];

	u16 wep_tx_keyidx;



	/** WPA keys */

	struct WLAN_802_11_KEY wpa_mcast_key;

	struct WLAN_802_11_KEY wpa_unicast_key;

	struct enc_key wpa_mcast_key;

	struct enc_key wpa_unicast_key;



	struct wlan_802_11_security secinfo;
@@ -335,12 +335,12 @@ struct _wlan_adapter { 
	struct wlan_802_11_security secinfo;



	/** WEP keys */

	struct WLAN_802_11_KEY wep_keys[4];

	struct enc_key wep_keys[4];

	u16 wep_tx_keyidx;



	/** WPA keys */

	struct WLAN_802_11_KEY wpa_mcast_key;

	struct WLAN_802_11_KEY wpa_unicast_key;

	struct enc_key wpa_mcast_key;

	struct enc_key wpa_unicast_key;



	/** WPA Information Elements*/

	u8 wpa_ie[MAX_WPA_IE_LEN];