diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-05-10 22:55:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-05-11 14:54:54 -0400 |
| commit | 9408c297f6cee8e91ab2c51ec8d56e8c23c19a53 (patch) | |
| tree | 18c73d60059f4facd8f2951cd4944514090aaa4d /drivers/net/wireless/libertas/scan.c | |
| parent | 2a6f7ea1a0562abe6afbd2bbe01f6d300de12228 (diff) | |
[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 <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
| -rw-r--r-- | drivers/net/wireless/libertas/scan.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index eabd80a1bb0..ddd95eb4ad2 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c @@ -94,7 +94,6 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) && !adapter->secinfo.WPA2enabled && adapter->scantable[index].wpa_ie[0] != WPA_IE && adapter->scantable[index].rsn_ie[0] != WPA2_IE - && adapter->secinfo.Encryptionmode == CIPHER_NONE && !adapter->scantable[index].privacy) { /* no security */ LEAVE(); @@ -116,7 +115,7 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) /* WPA enabled */ lbs_pr_debug(1, "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, adapter->scantable[index].wpa_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", (adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d", - adapter->secinfo.Encryptionmode, adapter->scantable[index].privacy); LEAVE(); return index; @@ -138,7 +136,7 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) /* WPA2 enabled */ lbs_pr_debug(1, "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, adapter->scantable[index].wpa_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", (adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d", - adapter->secinfo.Encryptionmode, adapter->scantable[index].privacy); LEAVE(); return index; @@ -155,16 +152,14 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) && !adapter->secinfo.WPA2enabled && (adapter->scantable[index].wpa_ie[0] != WPA_IE) && (adapter->scantable[index].rsn_ie[0] != WPA2_IE) - && adapter->secinfo.Encryptionmode != CIPHER_NONE && adapter->scantable[index].privacy) { /* dynamic WEP enabled */ lbs_pr_debug(1, "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, adapter->scantable[index].wpa_ie[0], adapter->scantable[index].rsn_ie[0], - adapter->secinfo.Encryptionmode, adapter->scantable[index].privacy); LEAVE(); return index; @@ -173,15 +168,13 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) /* security doesn't match */ lbs_pr_debug(1, "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, adapter->scantable[index].wpa_ie[0], adapter->scantable[index].rsn_ie[0], - (adapter->secinfo.WEPstatus == - wlan802_11WEPenabled) ? "e" : "d", + (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) ? "e" : "d", (adapter->secinfo.WPAenabled) ? "e" : "d", (adapter->secinfo.WPA2enabled) ? "e" : "d", - adapter->secinfo.Encryptionmode, adapter->scantable[index].privacy); LEAVE(); return -ECONNREFUSED; |