Merge commit 'v2.6.29-rc1' into timers/urgent

[linux-2.6-omap-h63xx.git] / include / net / ieee80211.h

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 738734a4653bd0f65bcc0edf579301b15de99bff..adb7cf31f781f48cd564df727400f173b8e93d66 100644 (file)
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -30,6 +30,8 @@
 #include <linux/wireless.h>
 #include <linux/ieee80211.h>
 
+#include <net/lib80211.h>
+
 #define IEEE80211_VERSION "git-1.1.13"
 
 #define IEEE80211_DATA_LEN             2304
@@ -355,8 +357,6 @@ struct ieee80211_stats {
 
 struct ieee80211_device;
 
-#include "ieee80211_crypt.h"
-
 #define SEC_KEY_1              (1<<0)
 #define SEC_KEY_2              (1<<1)
 #define SEC_KEY_3              (1<<2)
@@ -385,9 +385,8 @@ struct ieee80211_device;
 #define SCM_TEMPORAL_KEY_LENGTH        16
 
 struct ieee80211_security {
-       u16 active_key:2,
-           enabled:1,
-           auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1;
+       u16 active_key:2, enabled:1, unicast_uses_group:1, encrypt:1;
+       u8 auth_mode;
        u8 encode_alg[WEP_KEYS];
        u8 key_sizes[WEP_KEYS];
        u8 keys[WEP_KEYS][SCM_KEY_LEN];
@@ -937,11 +936,7 @@ struct ieee80211_device {
        size_t wpa_ie_len;
        u8 *wpa_ie;
 
-       struct list_head crypt_deinit_list;
-       struct ieee80211_crypt_data *crypt[WEP_KEYS];
-       int tx_keyidx;          /* default TX key index (crypt[tx_keyidx]) */
-       struct timer_list crypt_deinit_timer;
-       int crypt_quiesced;
+       struct lib80211_crypt_info crypt_info;
 
        int bcrx_sta_key;       /* use individual keys to override default keys even
                                 * with RX of broad/multicast frames */