Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 19:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] libertas: remove custom encryption mode stuff

Browse Source 
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 <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams 2007-05-10 22:55:20 -04:00 committed by John W. Linville
parent 2a6f7ea1a0
commit 9408c297f6
6 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/libertas/cmdresp.c
View File

@ -72,8 +72,6 @@ void libertas_mac_event_disconnected(wlan_private * priv)
adapter->secinfo.WPAenabled = 0; adapter->secinfo.WPAenabled = 0;
adapter->secinfo.WPA2enabled = 0; adapter->secinfo.WPA2enabled = 0;
adapter->wpa_ie_len = 0; adapter->wpa_ie_len = 0;
adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;
adapter->secinfo.Encryptionmode = CIPHER_NONE;
adapter->connect_status = libertas_disconnected; adapter->connect_status = libertas_disconnected;

9
drivers/net/wireless/libertas/defs.h
View File

@ -223,15 +223,6 @@ enum SNRNF_DATA {
MAX_TYPE_AVG 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 */ /** WLAN_802_11_POWER_MODE */
enum WLAN_802_11_POWER_MODE { enum WLAN_802_11_POWER_MODE {
wlan802_11powermodecam, wlan802_11powermodecam,

1
drivers/net/wireless/libertas/dev.h
View File

@ -59,7 +59,6 @@ struct wlan_802_11_security {
u8 WPA2enabled; u8 WPA2enabled;
enum WLAN_802_11_WEP_STATUS WEPstatus; enum WLAN_802_11_WEP_STATUS WEPstatus;
enum WLAN_802_11_AUTHENTICATION_MODE authmode; enum WLAN_802_11_AUTHENTICATION_MODE authmode;
enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;
}; };
/** Current Basic Service Set State Structure */ /** Current Basic Service Set State Structure */

1
drivers/net/wireless/libertas/fw.c
View File

@ -201,7 +201,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->wep_tx_keyidx = 0; adapter->wep_tx_keyidx = 0;
adapter->secinfo.WEPstatus = wlan802_11WEPdisabled; adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;
adapter->secinfo.authmode = wlan802_11authmodeopen; adapter->secinfo.authmode = wlan802_11authmodeopen;
adapter->secinfo.Encryptionmode = CIPHER_NONE;
adapter->inframode = wlan802_11infrastructure; adapter->inframode = wlan802_11infrastructure;
adapter->assoc_req = NULL; adapter->assoc_req = NULL;

28
drivers/net/wireless/libertas/ioctl.c
View File

@ -577,30 +577,6 @@ static int wlan_set_multiple_dtim_ioctl(wlan_private * priv, struct ifreq *req)
return ret; return ret;
} }
static int wlan_setencryptionmode_ioctl(wlan_private * priv, struct ifreq *req)
{
int mode;
struct iwreq *wrq = (struct iwreq *)req;
ENTER();
if (wrq->u.data.flags == 0) {
//from iwpriv subcmd
mode = SUBCMD_DATA(wrq);
} else {
//from wpa_supplicant subcmd
if (copy_from_user(&mode, wrq->u.data.pointer, sizeof(int))) {
lbs_pr_debug(1, "Copy from user failed\n");
return -EFAULT;
}
}
lbs_pr_debug(1, "encryption mode is %#x\n", mode);
priv->adapter->secinfo.Encryptionmode = mode;
LEAVE();
return 0;
}
static void adjust_mtu(wlan_private * priv) static void adjust_mtu(wlan_private * priv)
{ {
int mtu_increment = 0; int mtu_increment = 0;
@ -2002,10 +1978,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
ret = wlan_set_multiple_dtim_ioctl(priv, req); ret = wlan_set_multiple_dtim_ioctl(priv, req);
break; break;
case WLANSETENCRYPTIONMODE:
ret = wlan_setencryptionmode_ioctl(priv, req);
break;
case WLAN_SET_LINKMODE: case WLAN_SET_LINKMODE:
ret = wlan_set_linkmode_ioctl(priv, req); ret = wlan_set_linkmode_ioctl(priv, req);
break; break;

17
drivers/net/wireless/libertas/scan.c
View File

@ -94,7 +94,6 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
&& !adapter->secinfo.WPA2enabled && !adapter->secinfo.WPA2enabled
&& adapter->scantable[index].wpa_ie[0] != WPA_IE && adapter->scantable[index].wpa_ie[0] != WPA_IE
&& adapter->scantable[index].rsn_ie[0] != WPA2_IE && adapter->scantable[index].rsn_ie[0] != WPA2_IE
&& adapter->secinfo.Encryptionmode == CIPHER_NONE
&& !adapter->scantable[index].privacy) { && !adapter->scantable[index].privacy) {
/* no security */ /* no security */
LEAVE(); LEAVE();
@ -116,7 +115,7 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
/* WPA enabled */ /* WPA enabled */
lbs_pr_debug(1, lbs_pr_debug(1,
"is_network_compatible() WPA: index=%d wpa_ie=%#x " "is_network_compatible() WPA: index=%d wpa_ie=%#x "
"wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x " "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
"privacy=%#x\n", index, "privacy=%#x\n", index,
adapter->scantable[index].wpa_ie[0], adapter->scantable[index].wpa_ie[0],
adapter->scantable[index].rsn_ie[0], adapter->scantable[index].rsn_ie[0],
@ -124,7 +123,6 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
wlan802_11WEPenabled) ? "e" : "d", wlan802_11WEPenabled) ? "e" : "d",
(adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPAenabled) ? "e" : "d",
(adapter->secinfo.WPA2enabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d",
adapter->secinfo.Encryptionmode,
adapter->scantable[index].privacy); adapter->scantable[index].privacy);
LEAVE(); LEAVE();
return index; return index;
@ -138,7 +136,7 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
/* WPA2 enabled */ /* WPA2 enabled */
lbs_pr_debug(1, lbs_pr_debug(1,
"is_network_compatible() WPA2: index=%d wpa_ie=%#x " "is_network_compatible() WPA2: index=%d wpa_ie=%#x "
"wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x " "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
"privacy=%#x\n", index, "privacy=%#x\n", index,
adapter->scantable[index].wpa_ie[0], adapter->scantable[index].wpa_ie[0],
adapter->scantable[index].rsn_ie[0], adapter->scantable[index].rsn_ie[0],
@ -146,7 +144,6 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
wlan802_11WEPenabled) ? "e" : "d", wlan802_11WEPenabled) ? "e" : "d",
(adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPAenabled) ? "e" : "d",
(adapter->secinfo.WPA2enabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d",
adapter->secinfo.Encryptionmode,
adapter->scantable[index].privacy); adapter->scantable[index].privacy);
LEAVE(); LEAVE();
return index; return index;
@ -155,16 +152,14 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
&& !adapter->secinfo.WPA2enabled && !adapter->secinfo.WPA2enabled
&& (adapter->scantable[index].wpa_ie[0] != WPA_IE) && (adapter->scantable[index].wpa_ie[0] != WPA_IE)
&& (adapter->scantable[index].rsn_ie[0] != WPA2_IE) && (adapter->scantable[index].rsn_ie[0] != WPA2_IE)
&& adapter->secinfo.Encryptionmode != CIPHER_NONE
&& adapter->scantable[index].privacy) { && adapter->scantable[index].privacy) {
/* dynamic WEP enabled */ /* dynamic WEP enabled */
lbs_pr_debug(1, lbs_pr_debug(1,
"is_network_compatible() dynamic WEP: index=%d " "is_network_compatible() dynamic WEP: index=%d "
"wpa_ie=%#x wpa2_ie=%#x Encmode=%#x privacy=%#x\n", "wpa_ie=%#x wpa2_ie=%#x privacy=%#x\n",
index, index,
adapter->scantable[index].wpa_ie[0], adapter->scantable[index].wpa_ie[0],
adapter->scantable[index].rsn_ie[0], adapter->scantable[index].rsn_ie[0],
adapter->secinfo.Encryptionmode,
adapter->scantable[index].privacy); adapter->scantable[index].privacy);
LEAVE(); LEAVE();
return index; return index;
@ -173,15 +168,13 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
/* security doesn't match */ /* security doesn't match */
lbs_pr_debug(1, lbs_pr_debug(1,
"is_network_compatible() FAILED: index=%d wpa_ie=%#x " "is_network_compatible() FAILED: index=%d wpa_ie=%#x "
"wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x privacy=%#x\n", "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s privacy=%#x\n",
index, index,
adapter->scantable[index].wpa_ie[0], adapter->scantable[index].wpa_ie[0],
adapter->scantable[index].rsn_ie[0], adapter->scantable[index].rsn_ie[0],
(adapter->secinfo.WEPstatus == (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) ? "e" : "d",
wlan802_11WEPenabled) ? "e" : "d",
(adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPAenabled) ? "e" : "d",
(adapter->secinfo.WPA2enabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d",
adapter->secinfo.Encryptionmode,
adapter->scantable[index].privacy); adapter->scantable[index].privacy);
LEAVE(); LEAVE();
return -ECONNREFUSED; return -ECONNREFUSED;