Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / include / net / ieee80211_crypt.h

diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index 0c9d859d912edded9386a8c4448dcf3996609651..cd82c3e998e42860698716feadf6bad275e3ac76 100644 (file)
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -23,14 +23,21 @@
 #ifndef IEEE80211_CRYPT_H
 #define IEEE80211_CRYPT_H
 
-#include <linux/skbuff.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <net/ieee80211.h>
+#include <asm/atomic.h>
 
 enum {
-       IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1<<0),
+       IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1 << 0),
 };
 
+struct sk_buff;
+struct module;
+
 struct ieee80211_crypto_ops {
        const char *name;
+       struct list_head list;
 
        /* init new crypto context (e.g., allocate private data space,
         * select IV, etc.); returns NULL on failure or pointer to allocated
@@ -65,8 +72,8 @@ struct ieee80211_crypto_ops {
        char *(*print_stats) (char *p, void *priv);
 
        /* Crypto specific flag get/set for configuration settings */
-       unsigned long (*get_flags)(void *priv);
-       unsigned long (*set_flags)(unsigned long flags, void *priv);
+       unsigned long (*get_flags) (void *priv);
+       unsigned long (*set_flags) (unsigned long flags, void *priv);
 
        /* maximum number of bytes added by encryption; encrypt buf is
         * allocated with extra_prefix_len bytes, copy of in_buf, and
@@ -86,6 +93,8 @@ struct ieee80211_crypt_data {
        atomic_t refcnt;
 };
 
+struct ieee80211_device;
+
 int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
 int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
 struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name);