diff options
-rw-r--r-- | include/net/ieee80211.h | 7 | ||||
-rw-r--r-- | net/ieee80211/ieee80211_module.c | 24 |
2 files changed, 25 insertions, 6 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 61a23d38b429..4a1340b8341c 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -17,6 +17,11 @@ | |||
17 | * it under the terms of the GNU General Public License version 2 as | 17 | * it under the terms of the GNU General Public License version 2 as |
18 | * published by the Free Software Foundation. See README and COPYING for | 18 | * published by the Free Software Foundation. See README and COPYING for |
19 | * more details. | 19 | * more details. |
20 | * | ||
21 | * API Version History | ||
22 | * 1.0.x -- Initial version | ||
23 | * 1.1.x -- Added radiotap, QoS, TIM, ieee80211_geo APIs, | ||
24 | * various structure changes, and crypto API init method | ||
20 | */ | 25 | */ |
21 | #ifndef IEEE80211_H | 26 | #ifndef IEEE80211_H |
22 | #define IEEE80211_H | 27 | #define IEEE80211_H |
@@ -24,6 +29,8 @@ | |||
24 | #include <linux/kernel.h> /* ARRAY_SIZE */ | 29 | #include <linux/kernel.h> /* ARRAY_SIZE */ |
25 | #include <linux/wireless.h> | 30 | #include <linux/wireless.h> |
26 | 31 | ||
32 | #define IEEE80211_VERSION "git-1.1.5" | ||
33 | |||
27 | #define IEEE80211_DATA_LEN 2304 | 34 | #define IEEE80211_DATA_LEN 2304 |
28 | /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section | 35 | /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section |
29 | 6.2.1.1.2. | 36 | 6.2.1.1.2. |
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 0ae91c9917cf..319312564167 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c | |||
@@ -53,13 +53,16 @@ | |||
53 | 53 | ||
54 | #include <net/ieee80211.h> | 54 | #include <net/ieee80211.h> |
55 | 55 | ||
56 | MODULE_DESCRIPTION("802.11 data/management/control stack"); | 56 | #define DRV_DESCRIPTION "802.11 data/management/control stack" |
57 | MODULE_AUTHOR | 57 | #define DRV_NAME "ieee80211" |
58 | ("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>"); | 58 | #define DRV_VERSION IEEE80211_VERSION |
59 | #define DRV_COPYRIGHT "Copyright (C) 2004-2005 Intel Corporation <jketreno@linux.intel.com>" | ||
60 | |||
61 | MODULE_VERSION(DRV_VERSION); | ||
62 | MODULE_DESCRIPTION(DRV_DESCRIPTION); | ||
63 | MODULE_AUTHOR(DRV_COPYRIGHT); | ||
59 | MODULE_LICENSE("GPL"); | 64 | MODULE_LICENSE("GPL"); |
60 | 65 | ||
61 | #define DRV_NAME "ieee80211" | ||
62 | |||
63 | static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) | 66 | static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) |
64 | { | 67 | { |
65 | if (ieee->networks) | 68 | if (ieee->networks) |
@@ -220,9 +223,11 @@ static int store_debug_level(struct file *file, const char __user * buffer, | |||
220 | 223 | ||
221 | return strnlen(buf, len); | 224 | return strnlen(buf, len); |
222 | } | 225 | } |
226 | #endif /* CONFIG_IEEE80211_DEBUG */ | ||
223 | 227 | ||
224 | static int __init ieee80211_init(void) | 228 | static int __init ieee80211_init(void) |
225 | { | 229 | { |
230 | #ifdef CONFIG_IEEE80211_DEBUG | ||
226 | struct proc_dir_entry *e; | 231 | struct proc_dir_entry *e; |
227 | 232 | ||
228 | ieee80211_debug_level = debug; | 233 | ieee80211_debug_level = debug; |
@@ -242,26 +247,33 @@ static int __init ieee80211_init(void) | |||
242 | e->read_proc = show_debug_level; | 247 | e->read_proc = show_debug_level; |
243 | e->write_proc = store_debug_level; | 248 | e->write_proc = store_debug_level; |
244 | e->data = NULL; | 249 | e->data = NULL; |
250 | #endif /* CONFIG_IEEE80211_DEBUG */ | ||
251 | |||
252 | printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); | ||
253 | printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); | ||
245 | 254 | ||
246 | return 0; | 255 | return 0; |
247 | } | 256 | } |
248 | 257 | ||
249 | static void __exit ieee80211_exit(void) | 258 | static void __exit ieee80211_exit(void) |
250 | { | 259 | { |
260 | #ifdef CONFIG_IEEE80211_DEBUG | ||
251 | if (ieee80211_proc) { | 261 | if (ieee80211_proc) { |
252 | remove_proc_entry("debug_level", ieee80211_proc); | 262 | remove_proc_entry("debug_level", ieee80211_proc); |
253 | remove_proc_entry(DRV_NAME, proc_net); | 263 | remove_proc_entry(DRV_NAME, proc_net); |
254 | ieee80211_proc = NULL; | 264 | ieee80211_proc = NULL; |
255 | } | 265 | } |
266 | #endif /* CONFIG_IEEE80211_DEBUG */ | ||
256 | } | 267 | } |
257 | 268 | ||
269 | #ifdef CONFIG_IEEE80211_DEBUG | ||
258 | #include <linux/moduleparam.h> | 270 | #include <linux/moduleparam.h> |
259 | module_param(debug, int, 0444); | 271 | module_param(debug, int, 0444); |
260 | MODULE_PARM_DESC(debug, "debug output mask"); | 272 | MODULE_PARM_DESC(debug, "debug output mask"); |
273 | #endif /* CONFIG_IEEE80211_DEBUG */ | ||
261 | 274 | ||
262 | module_exit(ieee80211_exit); | 275 | module_exit(ieee80211_exit); |
263 | module_init(ieee80211_init); | 276 | module_init(ieee80211_init); |
264 | #endif | ||
265 | 277 | ||
266 | const char *escape_essid(const char *essid, u8 essid_len) | 278 | const char *escape_essid(const char *essid, u8 essid_len) |
267 | { | 279 | { |