diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
commit | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (patch) | |
tree | 86fdb4d2d6cef932af7497f28827e7d52b29e48c /include/net | |
parent | 7df446e7e043b2ba5fd5de42529f9d797e8b501a (diff) | |
parent | f406db8cba6bbce42b96490e6d31bdec229ad994 (diff) | |
download | kernel_samsung_smdk4412-a7c243b544c0e9f6775c2607decaa59d54fb9e11.zip kernel_samsung_smdk4412-a7c243b544c0e9f6775c2607decaa59d54fb9e11.tar.gz kernel_samsung_smdk4412-a7c243b544c0e9f6775c2607decaa59d54fb9e11.tar.bz2 |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ieee80211.h | 2 | ||||
-rw-r--r-- | include/net/ieee80211_crypt.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 5e38dca..b93fd8c 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -29,7 +29,7 @@ #include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/wireless.h> -#define IEEE80211_VERSION "git-1.1.6" +#define IEEE80211_VERSION "git-1.1.7" #define IEEE80211_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h index 0a1c2d8..225fc751 100644 --- a/include/net/ieee80211_crypt.h +++ b/include/net/ieee80211_crypt.h @@ -31,6 +31,7 @@ enum { 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 |