diff options
| author | John W. Linville | 2008-10-29 16:35:05 +0100 |
|---|---|---|
| committer | John W. Linville | 2008-11-21 17:08:17 +0100 |
| commit | 274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d (patch) | |
| tree | 04cd3f6a062496911b56737daa6a0858b769ccd6 /include/net/ieee80211.h | |
| parent | orinoco: fix last beacon reporting on 64-bit systems (diff) | |
| download | kernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.tar.gz kernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.tar.xz kernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.zip | |
lib80211: absorb crypto bits from net/ieee80211
These bits are shared already between ipw2x00 and hostap, and could
probably be shared both more cleanly and with other drivers. This
commit simply relocates the code to lib80211 and adjusts the drivers
appropriately.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 738734a4653b..7ab3ed2bbccb 100644 --- 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) @@ -937,11 +937,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 */ |