diff options
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 3 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211mod.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 5 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211req.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211wep.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2mgmt.c | 3 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2mib.c | 3 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 6 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/version.h | 56 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/wlan_compat.h | 2 |
12 files changed, 6 insertions, 77 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 06700683f0a..53c547d36ed 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c | |||
@@ -114,9 +114,6 @@ | |||
114 | /* System Includes */ | 114 | /* System Includes */ |
115 | #define WLAN_DBVAR prism2_debug | 115 | #define WLAN_DBVAR prism2_debug |
116 | 116 | ||
117 | #include "version.h" | ||
118 | |||
119 | |||
120 | #include <linux/version.h> | 117 | #include <linux/version.h> |
121 | 118 | ||
122 | #include <linux/module.h> | 119 | #include <linux/module.h> |
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index aaf1c9d4448..749ea8d9320 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c | |||
@@ -70,7 +70,6 @@ | |||
70 | 70 | ||
71 | #include <asm/byteorder.h> | 71 | #include <asm/byteorder.h> |
72 | 72 | ||
73 | #include "version.h" | ||
74 | #include "wlan_compat.h" | 73 | #include "wlan_compat.h" |
75 | 74 | ||
76 | /*================================================================*/ | 75 | /*================================================================*/ |
diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index 7a3834e16da..29cae879ff4 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c | |||
@@ -68,7 +68,6 @@ | |||
68 | #include <linux/wireless.h> | 68 | #include <linux/wireless.h> |
69 | #include <linux/netdevice.h> | 69 | #include <linux/netdevice.h> |
70 | 70 | ||
71 | #include "version.h" | ||
72 | #include "wlan_compat.h" | 71 | #include "wlan_compat.h" |
73 | 72 | ||
74 | /*================================================================*/ | 73 | /*================================================================*/ |
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 7b38883bf00..fa8bc767d9b 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c | |||
@@ -85,7 +85,6 @@ | |||
85 | /*================================================================*/ | 85 | /*================================================================*/ |
86 | /* Project Includes */ | 86 | /* Project Includes */ |
87 | 87 | ||
88 | #include "version.h" | ||
89 | #include "wlan_compat.h" | 88 | #include "wlan_compat.h" |
90 | #include "p80211types.h" | 89 | #include "p80211types.h" |
91 | #include "p80211hdr.h" | 90 | #include "p80211hdr.h" |
@@ -1102,8 +1101,8 @@ p80211netdev_proc_read( | |||
1102 | goto exit; | 1101 | goto exit; |
1103 | } | 1102 | } |
1104 | 1103 | ||
1105 | p += sprintf(p, "p80211 version: %s (%s)\n\n", | 1104 | p += sprintf(p, "p80211 version: %s\n\n", |
1106 | WLAN_RELEASE, WLAN_BUILD_DATE); | 1105 | WLAN_RELEASE); |
1107 | p += sprintf(p, "name : %s\n", wlandev->name); | 1106 | p += sprintf(p, "name : %s\n", wlandev->name); |
1108 | p += sprintf(p, "nsd name : %s\n", wlandev->nsdname); | 1107 | p += sprintf(p, "nsd name : %s\n", wlandev->nsdname); |
1109 | p += sprintf(p, "address : %02x:%02x:%02x:%02x:%02x:%02x\n", | 1108 | p += sprintf(p, "address : %02x:%02x:%02x:%02x:%02x:%02x\n", |
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index 0233abeccc4..83bd65b6248 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c | |||
@@ -68,7 +68,6 @@ | |||
68 | #include <net/sock.h> | 68 | #include <net/sock.h> |
69 | #include <linux/netlink.h> | 69 | #include <linux/netlink.h> |
70 | 70 | ||
71 | #include "version.h" | ||
72 | #include "wlan_compat.h" | 71 | #include "wlan_compat.h" |
73 | 72 | ||
74 | /*================================================================*/ | 73 | /*================================================================*/ |
diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c index 11a50c7fbfc..0ab0d077af9 100644 --- a/drivers/staging/wlan-ng/p80211wep.c +++ b/drivers/staging/wlan-ng/p80211wep.c | |||
@@ -56,7 +56,6 @@ | |||
56 | #include <linux/slab.h> | 56 | #include <linux/slab.h> |
57 | #include <linux/random.h> | 57 | #include <linux/random.h> |
58 | 58 | ||
59 | #include "version.h" | ||
60 | #include "wlan_compat.h" | 59 | #include "wlan_compat.h" |
61 | 60 | ||
62 | // #define WEP_DEBUG | 61 | // #define WEP_DEBUG |
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index 84b6d320803..4a690199973 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c | |||
@@ -56,7 +56,6 @@ | |||
56 | /*================================================================*/ | 56 | /*================================================================*/ |
57 | /* Project Includes */ | 57 | /* Project Includes */ |
58 | 58 | ||
59 | #include "version.h" | ||
60 | #include "wlan_compat.h" | 59 | #include "wlan_compat.h" |
61 | 60 | ||
62 | #include "p80211types.h" | 61 | #include "p80211types.h" |
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c index de2ec1e7c9d..c2f61ede0c6 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.c +++ b/drivers/staging/wlan-ng/prism2mgmt.c | |||
@@ -61,9 +61,6 @@ | |||
61 | /* System Includes */ | 61 | /* System Includes */ |
62 | #define WLAN_DBVAR prism2_debug | 62 | #define WLAN_DBVAR prism2_debug |
63 | 63 | ||
64 | #include "version.h" | ||
65 | |||
66 | |||
67 | #include <linux/version.h> | 64 | #include <linux/version.h> |
68 | 65 | ||
69 | #include <linux/if_arp.h> | 66 | #include <linux/if_arp.h> |
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c index 5785ff97604..5a8dffc5e1b 100644 --- a/drivers/staging/wlan-ng/prism2mib.c +++ b/drivers/staging/wlan-ng/prism2mib.c | |||
@@ -54,9 +54,6 @@ | |||
54 | /* System Includes */ | 54 | /* System Includes */ |
55 | #define WLAN_DBVAR prism2_debug | 55 | #define WLAN_DBVAR prism2_debug |
56 | 56 | ||
57 | #include "version.h" | ||
58 | |||
59 | |||
60 | #include <linux/version.h> | 57 | #include <linux/version.h> |
61 | 58 | ||
62 | #include <linux/module.h> | 59 | #include <linux/module.h> |
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 8ce1ee970b8..05c048071e9 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -54,8 +54,6 @@ | |||
54 | /* System Includes */ | 54 | /* System Includes */ |
55 | #define WLAN_DBVAR prism2_debug | 55 | #define WLAN_DBVAR prism2_debug |
56 | 56 | ||
57 | #include "version.h" | ||
58 | |||
59 | #include <linux/version.h> | 57 | #include <linux/version.h> |
60 | #include <linux/module.h> | 58 | #include <linux/module.h> |
61 | #include <linux/moduleparam.h> | 59 | #include <linux/moduleparam.h> |
@@ -2221,9 +2219,9 @@ prism2sta_proc_read( | |||
2221 | // XXX 0x0001 for prism2.5/3, 0x0000 for prism2. | 2219 | // XXX 0x0001 for prism2.5/3, 0x0000 for prism2. |
2222 | hwtype = BIT0; | 2220 | hwtype = BIT0; |
2223 | 2221 | ||
2224 | p += sprintf(p, "# %s version %s (%s)\n\n", | 2222 | p += sprintf(p, "# %s version %s\n\n", |
2225 | dev_info, | 2223 | dev_info, |
2226 | WLAN_RELEASE, WLAN_BUILD_DATE); | 2224 | WLAN_RELEASE); |
2227 | 2225 | ||
2228 | p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n", | 2226 | p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n", |
2229 | hw->ident_nic.id, hw->ident_nic.major, | 2227 | hw->ident_nic.id, hw->ident_nic.major, |
diff --git a/drivers/staging/wlan-ng/version.h b/drivers/staging/wlan-ng/version.h deleted file mode 100644 index 86190a18aed..00000000000 --- a/drivers/staging/wlan-ng/version.h +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* src/include/wlan/version.h | ||
2 | * | ||
3 | * | ||
4 | * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. | ||
5 | * -------------------------------------------------------------------- | ||
6 | * | ||
7 | * linux-wlan | ||
8 | * | ||
9 | * The contents of this file are subject to the Mozilla Public | ||
10 | * License Version 1.1 (the "License"); you may not use this file | ||
11 | * except in compliance with the License. You may obtain a copy of | ||
12 | * the License at http://www.mozilla.org/MPL/ | ||
13 | * | ||
14 | * Software distributed under the License is distributed on an "AS | ||
15 | * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or | ||
16 | * implied. See the License for the specific language governing | ||
17 | * rights and limitations under the License. | ||
18 | * | ||
19 | * Alternatively, the contents of this file may be used under the | ||
20 | * terms of the GNU Public License version 2 (the "GPL"), in which | ||
21 | * case the provisions of the GPL are applicable instead of the | ||
22 | * above. If you wish to allow the use of your version of this file | ||
23 | * only under the terms of the GPL and not to allow others to use | ||
24 | * your version of this file under the MPL, indicate your decision | ||
25 | * by deleting the provisions above and replace them with the notice | ||
26 | * and other provisions required by the GPL. If you do not delete | ||
27 | * the provisions above, a recipient may use your version of this | ||
28 | * file under either the MPL or the GPL. | ||
29 | * | ||
30 | * -------------------------------------------------------------------- | ||
31 | * | ||
32 | * Inquiries regarding the linux-wlan Open Source project can be | ||
33 | * made directly to: | ||
34 | * | ||
35 | * AbsoluteValue Systems Inc. | ||
36 | * info@linux-wlan.com | ||
37 | * http://www.linux-wlan.com | ||
38 | * | ||
39 | * -------------------------------------------------------------------- | ||
40 | * | ||
41 | * Portions of the development of this software were funded by | ||
42 | * Intersil Corporation as part of PRISM(R) chipset product development. | ||
43 | * | ||
44 | * -------------------------------------------------------------------- | ||
45 | */ | ||
46 | #ifndef _WLAN_VERSION_H | ||
47 | #define _WLAN_VERSION_H | ||
48 | #ifndef KERNEL_VERSION | ||
49 | #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) | ||
50 | #endif | ||
51 | |||
52 | #define WLAN_RELEASE "0.2.8" | ||
53 | #define WLAN_RELEASE_CODE 0x000208 | ||
54 | #define WLAN_BUILD_DATE "Thu Oct 2 11:04:42 PDT 2008" | ||
55 | |||
56 | #endif | ||
diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h index 3127754f9fe..0ecc3fa4988 100644 --- a/drivers/staging/wlan-ng/wlan_compat.h +++ b/drivers/staging/wlan-ng/wlan_compat.h | |||
@@ -134,6 +134,8 @@ typedef int64_t INT64; | |||
134 | #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) | 134 | #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | #define WLAN_RELEASE "0.3.0-lkml" | ||
138 | |||
137 | #include <linux/hardirq.h> | 139 | #include <linux/hardirq.h> |
138 | 140 | ||
139 | #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args); | 141 | #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args); |