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

Commit 91d9b19a authored by Martin Hofmann's avatar Martin Hofmann Committed by Greg Kroah-Hartman
Browse files

vt6655: remove typedefs in wpactl.h 



wpactl.h contained some typedefs for enums. These were removed in this patch.
Also, a typedef for a type "unsigned long long" that was only instantiated in
one place was removed and its declaration altered.

Signed-off-by: default avatarMartin Hofmann <martin.hofmann@studium.uni-erlangen.de>
Signed-off-by: default avatarMichael Gunselmann <michael.gunselmann@studium.uni-erlangen.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0027d9a7

drivers/staging/vt6655/hostap.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static int hostap_set_encryption(PSDevice pDevice, 
	unsigned long dwKeyIndex = 0;

	unsigned char abyKey[MAX_KEY_LEN];

	unsigned char abySeq[MAX_KEY_LEN];

	NDIS_802_11_KEY_RSC   KeyRSC;

	unsigned long long KeyRSC;

	unsigned char byKeyDecMode = KEY_CTL_WEP;

	int     ret = 0;

	int     iNodeIndex = -1;

drivers/staging/vt6655/iwctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1827,7 +1827,7 @@ int iwctl_siwencodeext(struct net_device *dev, 
	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

	struct viawget_wpa_param *param = NULL;

//original member

	wpa_alg alg_name;

	enum wpa_alg alg_name;

	u8  addr[6];

	int key_idx, set_tx = 0;

	u8  seq[IW_ENCODE_SEQ_MAX_SIZE];

drivers/staging/vt6655/wpactl.h

+5 −7
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 


//WPA related



typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;

typedef enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,

	       CIPHER_WEP104 } wpa_cipher;

typedef enum { KEY_MGMT_802_1X, KEY_MGMT_CCKM, KEY_MGMT_PSK, KEY_MGMT_NONE,

	       KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE } wpa_key_mgmt;

enum wpa_alg { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP };

enum wpa_cipher { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,

		  CIPHER_WEP104 };

enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_CCKM, KEY_MGMT_PSK, KEY_MGMT_NONE,

		    KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE };



#define AUTH_ALG_OPEN_SYSTEM	0x01

#define AUTH_ALG_SHARED_KEY	0x02
@@ -51,8 +51,6 @@ typedef enum { KEY_MGMT_802_1X, KEY_MGMT_CCKM, KEY_MGMT_PSK, KEY_MGMT_NONE, 
#define GENERIC_INFO_ELEM 0xdd

#define RSN_INFO_ELEM 0x30



typedef unsigned long long   NDIS_802_11_KEY_RSC;



/*---------------------  Export Classes  ----------------------------*/



/*---------------------  Export Variables  --------------------------*/