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/fw.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/fw.c')
-rw-r--r-- | drivers/net/wireless/libertas/fw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c index f2d626d7de48..565506a9920b 100644 --- a/drivers/net/wireless/libertas/fw.c +++ b/drivers/net/wireless/libertas/fw.c | |||
@@ -194,12 +194,11 @@ static void wlan_init_adapter(wlan_private * priv) | |||
194 | adapter->scanmode = cmd_bss_type_any; | 194 | adapter->scanmode = cmd_bss_type_any; |
195 | 195 | ||
196 | /* 802.11 specific */ | 196 | /* 802.11 specific */ |
197 | adapter->secinfo.WEPstatus = wlan802_11WEPdisabled; | 197 | adapter->secinfo.wep_enabled = 0; |
198 | for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]); | 198 | for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]); |
199 | i++) | 199 | i++) |
200 | memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY)); | 200 | memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY)); |
201 | adapter->wep_tx_keyidx = 0; | 201 | adapter->wep_tx_keyidx = 0; |
202 | adapter->secinfo.WEPstatus = wlan802_11WEPdisabled; | ||
203 | adapter->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM; | 202 | adapter->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM; |
204 | adapter->inframode = wlan802_11infrastructure; | 203 | adapter->inframode = wlan802_11infrastructure; |
205 | 204 | ||