diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-05-10 22:57:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-05-11 14:54:54 -0400 |
| commit | 889c05bdf3056b029b9fa95096eac4f0dfd3fb6f (patch) | |
| tree | efbe9e5abc2ca8197cdd07044a39791725ffd226 /drivers/net/wireless/libertas/scan.c | |
| parent | 6affe785aaf983253b27e71e67bf5fceaee6ff88 (diff) | |
[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 <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 | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index ddd95eb4ad2..23f100a971b 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c @@ -89,7 +89,7 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) ENTER(); if (adapter->scantable[index].inframode == mode) { - if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled + if ( !adapter->secinfo.wep_enabled && !adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled && adapter->scantable[index].wpa_ie[0] != WPA_IE @@ -98,14 +98,14 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) /* no security */ LEAVE(); return index; - } else if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled + } else if ( adapter->secinfo.wep_enabled && !adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled && adapter->scantable[index].privacy) { /* static WEP enabled */ LEAVE(); return index; - } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled + } else if ( !adapter->secinfo.wep_enabled && adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled && (adapter->scantable[index].wpa_ie[0] == WPA_IE) @@ -119,14 +119,13 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) "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.WPAenabled) ? "e" : "d", - (adapter->secinfo.WPA2enabled) ? "e" : "d", + adapter->secinfo.wep_enabled ? "e" : "d", + adapter->secinfo.WPAenabled ? "e" : "d", + adapter->secinfo.WPA2enabled ? "e" : "d", adapter->scantable[index].privacy); LEAVE(); return index; - } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled + } else if ( !adapter->secinfo.wep_enabled && !adapter->secinfo.WPAenabled && adapter->secinfo.WPA2enabled && (adapter->scantable[index].rsn_ie[0] == WPA2_IE) @@ -140,14 +139,13 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) "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.WPAenabled) ? "e" : "d", - (adapter->secinfo.WPA2enabled) ? "e" : "d", + adapter->secinfo.wep_enabled ? "e" : "d", + adapter->secinfo.WPAenabled ? "e" : "d", + adapter->secinfo.WPA2enabled ? "e" : "d", adapter->scantable[index].privacy); LEAVE(); return index; - } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled + } else if ( !adapter->secinfo.wep_enabled && !adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled && (adapter->scantable[index].wpa_ie[0] != WPA_IE) @@ -172,9 +170,9 @@ static int is_network_compatible(wlan_adapter * adapter, int index, int mode) index, adapter->scantable[index].wpa_ie[0], adapter->scantable[index].rsn_ie[0], - (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) ? "e" : "d", - (adapter->secinfo.WPAenabled) ? "e" : "d", - (adapter->secinfo.WPA2enabled) ? "e" : "d", + adapter->secinfo.wep_enabled ? "e" : "d", + adapter->secinfo.WPAenabled ? "e" : "d", + adapter->secinfo.WPA2enabled ? "e" : "d", adapter->scantable[index].privacy); LEAVE(); return -ECONNREFUSED; |