From 1d42b8f293c55226d18d97127419157fa4e47b41 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 22:53:14 -0400 Subject: [PATCH] libertas: remove 8021xauthalgs private ioctl Useless; it set an internal variable that was unused anyway. A supplicant handles all 802.1x authentication, not the driver. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index fb1478c1b87d..888a007ef767 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -230,15 +230,6 @@ enum WLAN_802_11_AUTH_ALG { AUTH_ALG_NETWORK_EAP = 8, }; -/** WLAN_802_1X_AUTH_ALG */ -enum WLAN_802_1X_AUTH_ALG { - WLAN_1X_AUTH_ALG_NONE = 1, - WLAN_1X_AUTH_ALG_LEAP = 2, - WLAN_1X_AUTH_ALG_TLS = 4, - WLAN_1X_AUTH_ALG_TTLS = 8, - WLAN_1X_AUTH_ALG_MD5 = 16, -}; - /** WLAN_802_11_ENCRYPTION_MODE */ enum WLAN_802_11_ENCRYPTION_MODE { CIPHER_NONE, -- cgit v1.2.3 From 69f88dc5f9816ed6b137c095e8f6f289958d8108 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 23:11:46 -0400 Subject: [PATCH] libertas: remove setauthalg private ioctl Obsoleted by SIOCSIWAUTH's IW_AUTH_80211_AUTH_ALG option introduced by WE-18. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 888a007ef767..15fcb2c047f2 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -223,13 +223,6 @@ enum SNRNF_DATA { MAX_TYPE_AVG }; -/** WLAN_802_11_AUTH_ALG*/ -enum WLAN_802_11_AUTH_ALG { - AUTH_ALG_OPEN_SYSTEM = 1, - AUTH_ALG_SHARED_KEY = 2, - AUTH_ALG_NETWORK_EAP = 8, -}; - /** WLAN_802_11_ENCRYPTION_MODE */ enum WLAN_802_11_ENCRYPTION_MODE { CIPHER_NONE, -- cgit v1.2.3 From 9408c297f6cee8e91ab2c51ec8d56e8c23c19a53 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 22:55:20 -0400 Subject: [PATCH] libertas: remove custom encryption mode stuff Remove setencryptionmode private ioctl and Encryptionmode variable. Mostly unused, and its functionality is provided by other internal members like WEPstatus, WPAenabled, WPA2enabled, and SIOCSIWGENIE. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 15fcb2c047f2..a6dee5e4c1b3 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -223,15 +223,6 @@ enum SNRNF_DATA { MAX_TYPE_AVG }; -/** WLAN_802_11_ENCRYPTION_MODE */ -enum WLAN_802_11_ENCRYPTION_MODE { - CIPHER_NONE, - CIPHER_WEP40, - CIPHER_TKIP, - CIPHER_CCMP, - CIPHER_WEP104, -}; - /** WLAN_802_11_POWER_MODE */ enum WLAN_802_11_POWER_MODE { wlan802_11powermodecam, -- cgit v1.2.3 From 6affe785aaf983253b27e71e67bf5fceaee6ff88 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 22:56:42 -0400 Subject: [PATCH] libertas: remove WLAN_802_11_AUTHENTICATION_MODE Remove WLAN_802_11_AUTHENTICATION_MODE enum and use IW_AUTH_ALG_* instead. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index a6dee5e4c1b3..9f5459332bbc 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -276,13 +276,6 @@ enum WLAN_802_11_NETWORK_INFRASTRUCTURE { wlan802_11infrastructuremax }; -/** WLAN_802_11_AUTHENTICATION_MODE */ -enum WLAN_802_11_AUTHENTICATION_MODE { - wlan802_11authmodeopen = 0x00, - wlan802_11authmodeshared = 0x01, - wlan802_11authmodenetworkEAP = 0x80, -}; - /** WLAN_802_11_WEP_STATUS */ enum WLAN_802_11_WEP_STATUS { wlan802_11WEPenabled, -- cgit v1.2.3 From 889c05bdf3056b029b9fa95096eac4f0dfd3fb6f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 22:57:23 -0400 Subject: [PATCH] libertas: remove WLAN_802_11_WEP_STATUS enum Also change WEPstatus to "wep_enabled"; it's clearer and consistent with the WPAenabled and WPA2enabled members. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 9f5459332bbc..1168903972df 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -276,12 +276,6 @@ enum WLAN_802_11_NETWORK_INFRASTRUCTURE { wlan802_11infrastructuremax }; -/** WLAN_802_11_WEP_STATUS */ -enum WLAN_802_11_WEP_STATUS { - wlan802_11WEPenabled, - wlan802_11WEPdisabled, -}; - /** SNMP_MIB_INDEX_e */ enum SNMP_MIB_INDEX_e { desired_bsstype_i = 0, -- cgit v1.2.3 From 0dc5a29044d56912bf0d4e5cd19127f82b90c29c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 22:58:02 -0400 Subject: [PATCH] libertas: remove WLAN_802_11_NETWORK_INFRASTRUCTURE enum Use standard IW_MODE_* constants instead. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 1168903972df..9156bbc53a38 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -267,15 +267,6 @@ enum mv_ms_type { MVMS_EVENT }; -/** WLAN_802_11_NETWORK_INFRASTRUCTURE */ -enum WLAN_802_11_NETWORK_INFRASTRUCTURE { - wlan802_11ibss, - wlan802_11infrastructure, - wlan802_11autounknown, - /*defined as upper bound */ - wlan802_11infrastructuremax -}; - /** SNMP_MIB_INDEX_e */ enum SNMP_MIB_INDEX_e { desired_bsstype_i = 0, -- cgit v1.2.3 From 3a8b9a4a6b4e7cfd147f94f5772641a34e12efe4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 May 2007 23:05:55 -0400 Subject: [PATCH] libertas: Clean up debug defines Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/defs.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/net/wireless/libertas/defs.h') diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 9156bbc53a38..80dd9ea19c8e 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -9,6 +9,11 @@ extern unsigned int libertas_debug; +#ifdef CONFIG_LIBERTAS_DEBUG +#define DEBUG +#define PROC_DEBUG +#endif + #define DRV_NAME "usb8xxx" #define lbs_pr_info(format, args...) \ -- cgit v1.2.3