aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/dev.h
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-08-02 10:45:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:38 -0400
commit1443b6530d8db779082dc9fabbd894e2b551b101 (patch)
tree076a7d53d86b829ac1087df4a2f23b252c6648f3 /drivers/net/wireless/libertas/dev.h
parent0c9ca690e0117e1bf415d5f3e392e27c0c472c68 (diff)
[PATCH] libertas: rename WLAN_802_11_KEY to enc_key and clean up usage
It doesn't touch hardware and therefore doesn't need endian notations either. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/dev.h')
-rw-r--r--drivers/net/wireless/libertas/dev.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 675c65dbc070..184eee548572 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -188,12 +188,12 @@ struct assoc_request {
188 u8 bssid[ETH_ALEN]; 188 u8 bssid[ETH_ALEN];
189 189
190 /** WEP keys */ 190 /** WEP keys */
191 struct WLAN_802_11_KEY wep_keys[4]; 191 struct enc_key wep_keys[4];
192 u16 wep_tx_keyidx; 192 u16 wep_tx_keyidx;
193 193
194 /** WPA keys */ 194 /** WPA keys */
195 struct WLAN_802_11_KEY wpa_mcast_key; 195 struct enc_key wpa_mcast_key;
196 struct WLAN_802_11_KEY wpa_unicast_key; 196 struct enc_key wpa_unicast_key;
197 197
198 struct wlan_802_11_security secinfo; 198 struct wlan_802_11_security secinfo;
199 199
@@ -335,12 +335,12 @@ struct _wlan_adapter {
335 struct wlan_802_11_security secinfo; 335 struct wlan_802_11_security secinfo;
336 336
337 /** WEP keys */ 337 /** WEP keys */
338 struct WLAN_802_11_KEY wep_keys[4]; 338 struct enc_key wep_keys[4];
339 u16 wep_tx_keyidx; 339 u16 wep_tx_keyidx;
340 340
341 /** WPA keys */ 341 /** WPA keys */
342 struct WLAN_802_11_KEY wpa_mcast_key; 342 struct enc_key wpa_mcast_key;
343 struct WLAN_802_11_KEY wpa_unicast_key; 343 struct enc_key wpa_unicast_key;
344 344
345 /** WPA Information Elements*/ 345 /** WPA Information Elements*/
346 u8 wpa_ie[MAX_WPA_IE_LEN]; 346 u8 wpa_ie[MAX_WPA_IE_LEN];