openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] ieee80211: Added subsystem version string and reporting via MODULE_VERSION 

tree c1b50ac5d2d1f9b727c39c6bd86a7872f25a1127
parent 1bb997a3ac7dd1941e02426d2f70bd28993a82b7
author James Ketrenos <jketreno@linux.intel.com> 1126720779 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127314674 -0500

Added subsystem version string and reporting via MODULE_VERSION and
pritnk during load.

NOTE:  This is the version support split out from patch 24/29 of the
prior series.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
James Ketrenos 2005-09-21 11:58:46 -05:00 committed by Jeff Garzik
parent 8a4ae7f2e2
commit 31696160c7
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/ieee80211.h
View File

@ -17,6 +17,11 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. See README and COPYING for * published by the Free Software Foundation. See README and COPYING for
* more details. * more details.
*
* API Version History
* 1.0.x -- Initial version
* 1.1.x -- Added radiotap, QoS, TIM, ieee80211_geo APIs,
* various structure changes, and crypto API init method
*/ */
#ifndef IEEE80211_H #ifndef IEEE80211_H
#define IEEE80211_H #define IEEE80211_H
@ -24,6 +29,8 @@
#include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/kernel.h> /* ARRAY_SIZE */
#include <linux/wireless.h> #include <linux/wireless.h>
#define IEEE80211_VERSION "git-1.1.5"
#define IEEE80211_DATA_LEN 2304 #define IEEE80211_DATA_LEN 2304
/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
6.2.1.1.2. 6.2.1.1.2.

24
net/ieee80211/ieee80211_module.c
View File

@ -53,12 +53,15 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
MODULE_DESCRIPTION("802.11 data/management/control stack"); #define DRV_DESCRIPTION "802.11 data/management/control stack"
MODULE_AUTHOR #define DRV_NAME "ieee80211"
("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>"); #define DRV_VERSION IEEE80211_VERSION
MODULE_LICENSE("GPL"); #define DRV_COPYRIGHT "Copyright (C) 2004-2005 Intel Corporation <jketreno@linux.intel.com>"
#define DRV_NAME "ieee80211" MODULE_VERSION(DRV_VERSION);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR(DRV_COPYRIGHT);
MODULE_LICENSE("GPL");
static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
{ {
@ -220,9 +223,11 @@ static int store_debug_level(struct file *file, const char __user * buffer,
return strnlen(buf, len); return strnlen(buf, len);
} }
#endif /* CONFIG_IEEE80211_DEBUG */
static int __init ieee80211_init(void) static int __init ieee80211_init(void)
{ {
#ifdef CONFIG_IEEE80211_DEBUG
struct proc_dir_entry *e; struct proc_dir_entry *e;
ieee80211_debug_level = debug; ieee80211_debug_level = debug;
@ -242,26 +247,33 @@ static int __init ieee80211_init(void)
e->read_proc = show_debug_level; e->read_proc = show_debug_level;
e->write_proc = store_debug_level; e->write_proc = store_debug_level;
e->data = NULL; e->data = NULL;
#endif /* CONFIG_IEEE80211_DEBUG */
printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
return 0; return 0;
} }
static void __exit ieee80211_exit(void) static void __exit ieee80211_exit(void)
{ {
#ifdef CONFIG_IEEE80211_DEBUG
if (ieee80211_proc) { if (ieee80211_proc) {
remove_proc_entry("debug_level", ieee80211_proc); remove_proc_entry("debug_level", ieee80211_proc);
remove_proc_entry(DRV_NAME, proc_net); remove_proc_entry(DRV_NAME, proc_net);
ieee80211_proc = NULL; ieee80211_proc = NULL;
} }
#endif /* CONFIG_IEEE80211_DEBUG */
} }
#ifdef CONFIG_IEEE80211_DEBUG
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
module_param(debug, int, 0444); module_param(debug, int, 0444);
MODULE_PARM_DESC(debug, "debug output mask"); MODULE_PARM_DESC(debug, "debug output mask");
#endif /* CONFIG_IEEE80211_DEBUG */
module_exit(ieee80211_exit); module_exit(ieee80211_exit);
module_init(ieee80211_init); module_init(ieee80211_init);
#endif
const char *escape_essid(const char *essid, u8 essid_len) const char *escape_essid(const char *essid, u8 essid_len)
{ {