aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-09 00:00:29 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-09 00:00:29 -0500
commitf24e09754bcb4d367664ea635c0c4ccde6ec4df5 (patch)
treef456c46186b627fe8d4daab44697db5e88e0504a /include/net
parentd7eaee087a8cb850ed33ee39a3e2a0f02ecff44c (diff)
parentd7e02edbc52bc689279154b117b90fe6635fc14b (diff)
Merge rsync://bughost.org/repos/ieee80211-delta/
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ieee80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 5e38dca1d082..b93fd8c1d884 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -29,7 +29,7 @@
29#include <linux/kernel.h> /* ARRAY_SIZE */ 29#include <linux/kernel.h> /* ARRAY_SIZE */
30#include <linux/wireless.h> 30#include <linux/wireless.h>
31 31
32#define IEEE80211_VERSION "git-1.1.6" 32#define IEEE80211_VERSION "git-1.1.7"
33 33
34#define IEEE80211_DATA_LEN 2304 34#define IEEE80211_DATA_LEN 2304
35/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section 35/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section