aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-21 14:58:47 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-21 14:58:47 -0400
commit9789089703c244ad766a13f441936736b6b1e709 (patch)
tree096e552a197400429a033f235fadd4ccbe886f01 /include
parent59b81827071a8ae7f399da533d268e1e33bfeeb7 (diff)
parent519a62bb8a0b0b383e6022cad6242cf63efc015c (diff)
Merge rsync://bughost.org/repos/ieee80211-delta/
Diffstat (limited to 'include')
-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 58f62224e7ea..5e38dca1d082 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.5" 32#define IEEE80211_VERSION "git-1.1.6"
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