rpms/kernel/FC-6 d80211.patch, 1.1.2.1, 1.1.2.2 kernel-2.6.spec, 1.2849.4.1, 1.2849.4.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 1 18:55:32 UTC 2006
Author: linville
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv4774
Modified Files:
Tag: private-linville-netdev-fc6-3-branch
d80211.patch kernel-2.6.spec
Log Message:
d80211.patch:
CREDITS | 33
MAINTAINERS | 20
drivers/misc/Kconfig | 4
drivers/misc/Makefile | 1
drivers/misc/ssb.c | 1074 ++++
drivers/net/wireless/Kconfig | 2
drivers/net/wireless/Makefile | 3
drivers/net/wireless/d80211/Kconfig | 4
drivers/net/wireless/d80211/Makefile | 4
drivers/net/wireless/d80211/README | 2
drivers/net/wireless/d80211/adm8211/Kconfig | 24
drivers/net/wireless/d80211/adm8211/Makefile | 1
drivers/net/wireless/d80211/adm8211/adm8211.c | 2210 ++++++++
drivers/net/wireless/d80211/adm8211/adm8211.h | 622 ++
drivers/net/wireless/d80211/bcm43xx/Kconfig | 63
drivers/net/wireless/d80211/bcm43xx/Makefile | 12
drivers/net/wireless/d80211/bcm43xx/bcm43xx.h | 940 +++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c | 433 +
drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.h | 110
drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c | 1308 ++++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.h | 375 +
drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.c | 51
drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.h | 8
drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.c | 337 +
drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.h | 32
drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c | 299 +
drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.h | 56
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 4175 +++++++++++++++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.h | 144
drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c | 2338 ++++++++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.h | 74
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c | 684 ++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h | 170
drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.c | 377 +
drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.h | 56
drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.c | 2033 +++++++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.h | 100
drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.c | 232
drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.h | 9
drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c | 763 ++
drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.h | 290 +
drivers/net/wireless/d80211/p54/Kconfig | 6
drivers/net/wireless/d80211/p54/Makefile | 3
drivers/net/wireless/d80211/p54/prism54.h | 63
drivers/net/wireless/d80211/p54/prism54common.c | 677 ++
drivers/net/wireless/d80211/p54/prism54common.h | 278 +
drivers/net/wireless/d80211/p54/prism54magic.h | 24
drivers/net/wireless/d80211/p54/prism54usb.c | 553 ++
drivers/net/wireless/d80211/p54/prism54usb.h | 45
drivers/net/wireless/d80211/rt2x00/Kconfig | 78
drivers/net/wireless/d80211/rt2x00/Makefile | 5
drivers/net/wireless/d80211/rt2x00/rt2400pci.c | 3045 +++++++++++
drivers/net/wireless/d80211/rt2x00/rt2400pci.h | 948 +++
drivers/net/wireless/d80211/rt2x00/rt2500pci.c | 3330 ++++++++++++
drivers/net/wireless/d80211/rt2x00/rt2500pci.h | 1209 ++++
drivers/net/wireless/d80211/rt2x00/rt2500usb.c | 3015 +++++++++++
drivers/net/wireless/d80211/rt2x00/rt2500usb.h | 730 ++
drivers/net/wireless/d80211/rt2x00/rt2x00.h | 1124 ++++
drivers/net/wireless/d80211/rt2x00/rt2x00crc.h | 82
drivers/net/wireless/d80211/rt2x00/rt2x00pci.h | 47
drivers/net/wireless/d80211/rt2x00/rt2x00usb.h | 104
drivers/net/wireless/d80211/rt2x00/rt61pci.c | 3853 ++++++++++++++
drivers/net/wireless/d80211/rt2x00/rt61pci.h | 1415 +++++
drivers/net/wireless/d80211/rt2x00/rt73usb.c | 3360 ++++++++++++
drivers/net/wireless/d80211/rt2x00/rt73usb.h | 994 +++
include/linux/netdevice.h | 8
include/linux/nl80211.h | 276 +
include/linux/ssb.h | 617 ++
include/net/cfg80211.h | 205
include/net/d80211.h | 1065 +++
include/net/d80211_common.h | 98
include/net/d80211_mgmt.h | 223
include/net/d80211_shared.h | 46
include/net/netlink.h | 15
net/Kconfig | 32
net/Makefile | 2
net/core/Makefile | 1
net/core/dev.c | 40
net/core/net-sysfs.c | 4
net/core/rtnetlink.c | 39
net/core/wireless.c | 2352 --------
net/d80211/Kconfig | 69
net/d80211/Makefile | 26
net/d80211/aes_ccm.c | 164
net/d80211/aes_ccm.h | 26
net/d80211/fifo_qdisc.c | 102
net/d80211/hostapd_ioctl.h | 434 +
net/d80211/ieee80211.c | 4823 ++++++++++++++++++
net/d80211/ieee80211_dev.c | 117
net/d80211/ieee80211_i.h | 692 ++
net/d80211/ieee80211_iface.c | 384 +
net/d80211/ieee80211_ioctl.c | 3239 ++++++++++++
net/d80211/ieee80211_key.h | 88
net/d80211/ieee80211_led.c | 91
net/d80211/ieee80211_led.h | 32
net/d80211/ieee80211_rate.c | 140
net/d80211/ieee80211_rate.h | 161
net/d80211/ieee80211_scan.c | 350 +
net/d80211/ieee80211_sta.c | 2882 ++++++++++
net/d80211/ieee80211_sysfs.c | 787 ++
net/d80211/ieee80211_sysfs_sta.c | 437 +
net/d80211/michael.c | 104
net/d80211/michael.h | 20
net/d80211/rc80211_simple.c | 398 +
net/d80211/sta_info.c | 462 +
net/d80211/sta_info.h | 149
net/d80211/tkip.c | 339 +
net/d80211/tkip.h | 35
net/d80211/wep.c | 322 +
net/d80211/wep.h | 40
net/d80211/wme.c | 694 ++
net/d80211/wme.h | 38
net/d80211/wpa.c | 856 +++
net/d80211/wpa.h | 34
net/netlink/attr.c | 49
net/netlink/genetlink.c | 10
net/wireless/Makefile | 16
net/wireless/core.c | 245
net/wireless/core.h | 78
net/wireless/nl80211.c | 1050 +++
net/wireless/nl80211.h | 7
net/wireless/wext-common.c | 609 ++
net/wireless/wext-compat.c | 1633 ++++++
net/wireless/wext-old.c | 1730 ++++++
net/wireless/wext.h | 13
125 files changed, 71080 insertions(+), 2379 deletions(-)
Index: d80211.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/d80211.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- d80211.patch 30 Nov 2006 22:08:20 -0000 1.1.2.1
+++ d80211.patch 1 Dec 2006 18:55:30 -0000 1.1.2.2
@@ -1,5 +1,5 @@
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/net/d80211.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/net/d80211.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1065 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -1066,8 +1066,8 @@
+ ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
+
+#endif /* D80211_H */
---- linux-2.6.18.noarch/include/net/netlink.h.orig 2006-11-30 14:35:15.000000000 -0500
-+++ linux-2.6.18.noarch/include/net/netlink.h 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/include/net/netlink.h.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/include/net/netlink.h 2006-12-01 13:38:08.000000000 -0500
@@ -166,6 +166,7 @@ enum {
NLA_FLAG,
NLA_MSECS,
@@ -1109,7 +1109,7 @@
extern void netlink_run_queue(struct sock *sk, unsigned int *qlen,
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/net/d80211_shared.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/net/d80211_shared.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,46 @@
+/*
+ * IEEE 802.11 -- shared defines for low-level drivers, 80211.o, and hostapd
@@ -1158,7 +1158,7 @@
+
+#endif /* D80211_SHARED_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/net/cfg80211.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/net/cfg80211.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,205 @@
+#ifndef __NET_CFG80211_H
+#define __NET_CFG80211_H
@@ -1366,7 +1366,7 @@
+
+#endif /* __NET_CFG80211_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/net/d80211_mgmt.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/net/d80211_mgmt.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,223 @@
+/*
+ * IEEE 802.11 -- shared defines for 80211.o and hostapd
@@ -1592,7 +1592,7 @@
+
+#endif /* D802_11_MGMT_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/net/d80211_common.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/net/d80211_common.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,98 @@
+/*
+ * IEEE 802.11 driver (80211.o) -- hostapd interface
@@ -1693,7 +1693,7 @@
+
+#endif /* D80211_COMMON_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/linux/nl80211.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/linux/nl80211.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,276 @@
+#ifndef __LINUX_NL80211_H
+#define __LINUX_NL80211_H
@@ -1972,7 +1972,7 @@
+
+#endif /* __LINUX_NL80211_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/include/linux/ssb.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/include/linux/ssb.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,617 @@
+#ifndef LINUX__SONICS_SILICON_BACKPLANE_H_
+#define LINUX__SONICS_SILICON_BACKPLANE_H_
@@ -2591,8 +2591,8 @@
+int ssb_sprom_read(struct ssb *ssb, struct ssb_sprom *sprom, int force);
+
+#endif /* LINUX__SONICS_SILICON_BACKPLANE_H_ */
---- linux-2.6.18.noarch/include/linux/netdevice.h.orig 2006-11-30 14:35:24.000000000 -0500
-+++ linux-2.6.18.noarch/include/linux/netdevice.h 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/include/linux/netdevice.h.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/include/linux/netdevice.h 2006-12-01 13:38:08.000000000 -0500
@@ -339,12 +339,17 @@ struct net_device
struct net_device_stats* (*get_stats)(struct net_device *dev);
@@ -2620,8 +2620,8 @@
/*
* Cache line mostly used on receive path (including eth_type_trans())
---- linux-2.6.18.noarch/CREDITS.orig 2006-11-30 14:34:59.000000000 -0500
-+++ linux-2.6.18.noarch/CREDITS 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/CREDITS.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/CREDITS 2006-12-01 13:38:08.000000000 -0500
@@ -654,6 +654,11 @@ D: Minor updates to SCSI code for the Co
S: (ask for current address)
S: USA
@@ -2690,8 +2690,8 @@
N: Lars Wirzenius
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.18.noarch/MAINTAINERS.orig 2006-11-30 14:35:18.000000000 -0500
-+++ linux-2.6.18.noarch/MAINTAINERS 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/MAINTAINERS.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/MAINTAINERS 2006-12-01 13:38:08.000000000 -0500
@@ -241,6 +241,13 @@ M: khali at linux-fr.org
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -2734,7 +2734,7 @@
P: Stelian Pop
M: stelian at popies.net
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/misc/ssb.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/misc/ssb.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1074 @@
+/*
+ * Sonics Silicon Backplane backend.
@@ -3810,8 +3810,15 @@
+
+MODULE_DESCRIPTION("Sonics Silicon Backplane driver");
+MODULE_LICENSE("GPL");
---- linux-2.6.18.noarch/drivers/misc/Kconfig.orig 2006-09-19 23:42:06.000000000 -0400
-+++ linux-2.6.18.noarch/drivers/misc/Kconfig 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/drivers/misc/Makefile.orig 2006-12-01 13:38:19.000000000 -0500
++++ linux-2.6.18.noarch/drivers/misc/Makefile 2006-12-01 13:38:43.000000000 -0500
+@@ -5,3 +5,4 @@ obj- := misc.o # Dummy rule to force bui
+
+ obj-$(CONFIG_IBM_ASM) += ibmasm/
+ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
++obj-$(CONFIG_SONICS_SILICON_BACKPLANE) += ssb.o
+--- linux-2.6.18.noarch/drivers/misc/Kconfig.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/drivers/misc/Kconfig 2006-12-01 13:38:08.000000000 -0500
@@ -28,5 +28,9 @@ config IBM_ASM
If unsure, say N.
@@ -3822,8 +3829,8 @@
+
endmenu
---- linux-2.6.18.noarch/drivers/net/wireless/Makefile.orig 2006-11-30 14:35:00.000000000 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/Makefile 2006-11-30 14:36:17.000000000 -0500
+--- linux-2.6.18.noarch/drivers/net/wireless/Makefile.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/Makefile 2006-12-01 13:38:08.000000000 -0500
@@ -46,3 +46,6 @@ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
@@ -3832,7 +3839,7 @@
+# Drivers using Devicescape IEEE 802.11 stack (net/d80211)
+obj-y += d80211/
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,940 @@
+#ifndef BCM43xx_H_
+#define BCM43xx_H_
@@ -4775,7 +4782,7 @@
+
+#endif /* BCM43xx_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,100 @@
+/*
+
@@ -4878,7 +4885,7 @@
+
+#endif /* BCM43xx_RADIO_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,56 @@
+#ifndef BCM43xx_LEDS_H_
+#define BCM43xx_LEDS_H_
@@ -4937,7 +4944,7 @@
+
+#endif /* BCM43xx_LEDS_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,32 @@
+#ifndef BCM43xx_ILT_H_
+#define BCM43xx_ILT_H_
@@ -4972,7 +4979,7 @@
+
+#endif /* BCM43xx_ILT_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_radio.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,2033 @@
+/*
+
@@ -7008,7 +7015,7 @@
+ }
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/Makefile 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/Makefile 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,12 @@
+obj-$(CONFIG_BCM43XX_D80211) += bcm43xx-d80211.o
+bcm43xx-d80211-obj-$(CONFIG_BCM43XX_D80211_DEBUG) += bcm43xx_debugfs.o
@@ -7023,7 +7030,7 @@
+ bcm43xx_xmit.o \
+ $(bcm43xx-d80211-obj-y)
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ilt.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,337 @@
+/*
+
@@ -7363,7 +7370,7 @@
+ }
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,56 @@
+/*
+
@@ -7422,7 +7429,7 @@
+
+#endif /* BCM43xx_POWER_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,170 @@
+#ifndef BCM43xx_PIO_H_
+#define BCM43xx_PIO_H_
@@ -7595,7 +7602,7 @@
+#endif /* CONFIG_BCM43XX_D80211_PIO */
+#endif /* BCM43xx_PIO_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1308 @@
+/*
+
@@ -8906,7 +8913,7 @@
+ bcm43xx_power_saving_ctl_bits(ring->bcm, -1, -1);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.h 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,8 @@
+#ifndef BCM43xx_ETHTOOL_H_
+#define BCM43xx_ETHTOOL_H_
@@ -8917,7 +8924,7 @@
+
+#endif /* BCM43xx_ETHTOOL_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,433 @@
+/*
+
@@ -9353,7 +9360,7 @@
+ printk("\n");
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,4175 @@
+/*
+
@@ -13531,7 +13538,7 @@
+module_init(bcm43xx_init)
+module_exit(bcm43xx_exit)
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,232 @@
+/*
+
@@ -13766,7 +13773,7 @@
+ device_remove_file(dev, &dev_attr_interference);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/Kconfig 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/Kconfig 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,63 @@
+config BCM43XX_D80211
+ tristate "Broadcom BCM43xx wireless support (DeviceScape stack)"
@@ -13832,7 +13839,7 @@
+
+endchoice
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,377 @@
+/*
+
@@ -14212,7 +14219,7 @@
+ }
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c 2006-11-30 14:36:17.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,684 @@
+/*
+
@@ -14899,7 +14906,7 @@
+ tasklet_schedule(&pio->queue3->txtask);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,144 @@
+/*
+
@@ -15046,7 +15053,7 @@
+
+#endif /* BCM43xx_MAIN_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,74 @@
+/*
+
@@ -15123,7 +15130,7 @@
+
+#endif /* BCM43xx_PHY_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,290 @@
+#ifndef BCM43xx_XMIT_H_
+#define BCM43xx_XMIT_H_
@@ -15416,7 +15423,7 @@
+
+#endif /* BCM43xx_XMIT_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_ethtool.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+
@@ -15470,7 +15477,7 @@
+ .get_link = ethtool_op_get_link,
+};
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,299 @@
+/*
+
@@ -15772,7 +15779,7 @@
+ spin_unlock_irqrestore(&bcm->leds_lock, flags);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,2338 @@
+/*
+
@@ -18113,7 +18120,7 @@
+ phy->antenna_diversity = antennadiv;
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef BCM43xx_SYSFS_H_
+#define BCM43xx_SYSFS_H_
@@ -18125,7 +18132,7 @@
+
+#endif /* BCM43xx_SYSFS_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,375 @@
+#ifndef BCM43xx_DMA_H_
+#define BCM43xx_DMA_H_
@@ -18503,7 +18510,7 @@
+#endif /* CONFIG_BCM43XX_D80211_DMA */
+#endif /* BCM43xx_DMA_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,763 @@
+/*
+
@@ -19269,7 +19276,7 @@
+ bcm43xx_handle_txstatus(bcm, &status);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,110 @@
+#ifndef BCM43xx_DEBUGFS_H_
+#define BCM43xx_DEBUGFS_H_
@@ -19382,19 +19389,19 @@
+
+#endif /* BCM43xx_DEBUGFS_H_ */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/README 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/README 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,2 @@
+This directory contains IEEE 802.11 wireless LAN drivers that are using
+Devicescape IEEE 802.11 stack (net/d80211).
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/Makefile 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,4 @@
+obj-$(CONFIG_BCM43XX_D80211) += bcm43xx/
+obj-$(CONFIG_RT2X00) += rt2x00/
+obj-$(CONFIG_ADM8211) += adm8211/
+obj-$(CONFIG_P54_COMMON) += p54/
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500pci.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500pci.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1209 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -20606,7 +20613,7 @@
+
+#endif /* RT2500PCI_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00usb.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,104 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -20713,7 +20720,7 @@
+
+#endif /* RT2X00USB_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500usb.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500usb.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,3015 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -23731,7 +23738,7 @@
+module_init(rt2500usb_init);
+module_exit(rt2500usb_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1124 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -24858,7 +24865,7 @@
+
+#endif /* RT2X00_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt61pci.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt61pci.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,1415 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -26276,7 +26283,7 @@
+
+#endif /* RT61PCI_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/Makefile 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,5 @@
+obj-$(CONFIG_RT2400PCI) += rt2400pci.o
+obj-$(CONFIG_RT2500PCI) += rt2500pci.o
@@ -26285,7 +26292,7 @@
+obj-$(CONFIG_RT73USB) += rt73usb.o
\ No newline at end of file
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00pci.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -26335,7 +26342,7 @@
+
+#endif /* RT2X00PCI_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,3330 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -29668,7 +29675,7 @@
+module_init(rt2500pci_init);
+module_exit(rt2500pci_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500usb.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2500usb.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,730 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -30401,7 +30408,7 @@
+
+#endif /* RT2500USB_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/Kconfig 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/Kconfig 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,78 @@
+config RT2X00
+ bool "Ralink driver support"
@@ -30483,7 +30490,7 @@
+ Enable debugging output.
\ No newline at end of file
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt61pci.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt61pci.c 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,3853 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -34339,7 +34346,7 @@
+module_init(rt61pci_init);
+module_exit(rt61pci_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt73usb.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt73usb.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,994 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -35336,7 +35343,7 @@
+
+#endif /* RT73USB_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2400pci.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2400pci.h 2006-12-01 13:38:08.000000000 -0500
@@ -0,0 +1,948 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -36287,7 +36294,7 @@
+
+#endif /* RT2400PCI_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt73usb.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt73usb.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,3360 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -39650,7 +39657,7 @@
+module_init(rt73usb_init);
+module_exit(rt73usb_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00crc.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2x00crc.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,82 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -39735,7 +39742,7 @@
+
+#endif /* RT2X00CRC_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,3045 @@
+/*
+ Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -42783,14 +42790,14 @@
+module_init(rt2400pci_init);
+module_exit(rt2400pci_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/Kconfig 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,4 @@
+source "drivers/net/wireless/d80211/bcm43xx/Kconfig"
+source "drivers/net/wireless/d80211/rt2x00/Kconfig"
+source "drivers/net/wireless/d80211/adm8211/Kconfig"
+source "drivers/net/wireless/d80211/p54/Kconfig"
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54usb.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54usb.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,553 @@
+
+/*
@@ -43346,13 +43353,13 @@
+module_init(p54u_init);
+module_exit(p54u_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,3 @@
+obj-$(CONFIG_P54_COMMON) += prism54common.o
+obj-$(CONFIG_P54_USB) += prism54usb.o
+
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54usb.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54usb.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,45 @@
+#ifndef PRISM54USB_H
+#define PRISM54USB_H
@@ -43400,7 +43407,7 @@
+
+#endif /* PRISM54USB_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54common.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54common.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,677 @@
+
+/*
@@ -44080,7 +44087,7 @@
+module_init(p54_init);
+module_exit(p54_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54common.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54common.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,278 @@
+#ifndef PRISM54COMMON_H
+#define PRISM54COMMON_H
@@ -44361,7 +44368,7 @@
+
+#endif /* PRISM54COMMON_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/Kconfig 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,6 @@
+config P54_COMMON
+ tristate "Softmac Prism54 support"
@@ -44370,7 +44377,7 @@
+ tristate "Prism54 USB support"
+ depends on P54_COMMON && USB
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54magic.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54magic.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,24 @@
+#ifndef PRISM54MAGIC_H
+#define PRISM54MAGIC_H
@@ -44397,7 +44404,7 @@
+
+#endif /* PRISM54MAGIC_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/p54/prism54.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,63 @@
+#ifndef PRISM54_H
+#define PRISM54_H
@@ -44463,7 +44470,7 @@
+
+#endif /* PRISM54_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/adm8211.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/adm8211.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,2210 @@
+
+/*
@@ -46676,11 +46683,11 @@
+module_init(adm8211_init);
+module_exit(adm8211_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1 @@
+obj-$(CONFIG_ADM8211) += adm8211.o
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/Kconfig 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,24 @@
+config ADM8211
+ tristate "ADMtek ADM8211 support"
@@ -46707,7 +46714,7 @@
+
+ Thanks to Infineon-ADMtek for their support of this driver.
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/adm8211.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/d80211/adm8211/adm8211.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,622 @@
+#ifndef ADM8211_H
+#define ADM8211_H
@@ -47331,8 +47338,8 @@
+};
+
+#endif /* ADM8211_H */
---- linux-2.6.18.noarch/drivers/net/wireless/Kconfig.orig 2006-11-30 14:35:16.000000000 -0500
-+++ linux-2.6.18.noarch/drivers/net/wireless/Kconfig 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/drivers/net/wireless/Kconfig.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/drivers/net/wireless/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -556,6 +556,8 @@ source "drivers/net/wireless/bcm43xx/Kco
source "drivers/net/wireless/zd1211rw/Kconfig"
source "drivers/net/wireless/tiacx/Kconfig"
@@ -47342,8 +47349,8 @@
# yes, this works even when no drivers are selected
config NET_WIRELESS
bool
---- linux-2.6.18.noarch/net/Makefile.orig 2006-11-30 14:34:59.000000000 -0500
-+++ linux-2.6.18.noarch/net/Makefile 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/Makefile.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -45,6 +45,8 @@ obj-$(CONFIG_ECONET) += econet/
obj-$(CONFIG_VLAN_8021Q) += 8021q/
obj-$(CONFIG_IP_DCCP) += dccp/
@@ -47353,8 +47360,8 @@
obj-$(CONFIG_IEEE80211) += ieee80211/
obj-$(CONFIG_TIPC) += tipc/
obj-$(CONFIG_NETLABEL) += netlabel/
---- linux-2.6.18.noarch/net/core/dev.c.orig 2006-11-30 14:35:24.000000000 -0500
-+++ linux-2.6.18.noarch/net/core/dev.c 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/core/dev.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/core/dev.c 2006-12-01 13:38:09.000000000 -0500
@@ -117,6 +117,7 @@
#include <linux/dmaengine.h>
#include <linux/err.h>
@@ -47425,8 +47432,8 @@
copy_to_user(arg, &ifr,
sizeof(struct ifreq)))
ret = -EFAULT;
---- linux-2.6.18.noarch/net/core/Makefile.orig 2006-09-19 23:42:06.000000000 -0400
-+++ linux-2.6.18.noarch/net/core/Makefile 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/core/Makefile.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/core/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -14,6 +14,5 @@ obj-$(CONFIG_XFRM) += flow.o
obj-$(CONFIG_SYSFS) += net-sysfs.o
obj-$(CONFIG_NET_DIVERT) += dv.o
@@ -47434,8 +47441,8 @@
-obj-$(CONFIG_WIRELESS_EXT) += wireless.o
obj-$(CONFIG_NETPOLL) += netpoll.o
obj-$(CONFIG_NET_DMA) += user_dma.o
---- linux-2.6.18.noarch/net/core/rtnetlink.c.orig 2006-11-30 14:35:13.000000000 -0500
-+++ linux-2.6.18.noarch/net/core/rtnetlink.c 2006-11-30 15:55:30.000000000 -0500
+--- linux-2.6.18.noarch/net/core/rtnetlink.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/core/rtnetlink.c 2006-12-01 13:38:09.000000000 -0500
@@ -55,6 +55,9 @@
#include <linux/wireless.h>
#include <net/iw_handler.h>
@@ -47510,8 +47517,8 @@
#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
/* Create a skb big enough to include all the data.
---- linux-2.6.18.noarch/net/core/net-sysfs.c.orig 2006-11-30 14:35:14.000000000 -0500
-+++ linux-2.6.18.noarch/net/core/net-sysfs.c 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/core/net-sysfs.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/core/net-sysfs.c 2006-12-01 13:38:09.000000000 -0500
@@ -329,7 +329,7 @@ static struct attribute_group netstat_gr
.attrs = netstat_attrs,
};
@@ -47530,8 +47537,8 @@
if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
*groups++ = &wireless_group;
#endif
---- linux-2.6.18.noarch/net/core/wireless.c.orig 2006-11-30 14:35:17.000000000 -0500
-+++ linux-2.6.18.noarch/net/core/wireless.c 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/core/wireless.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/core/wireless.c 2006-12-01 13:38:09.000000000 -0500
@@ -1,2352 +0,0 @@
-/*
- * This file implement the Wireless Extensions APIs.
@@ -49886,7 +49893,7 @@
-EXPORT_SYMBOL(wireless_send_event);
-EXPORT_SYMBOL(wireless_spy_update);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/wext-common.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/wext-common.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,609 @@
+/* common wext support routines, proc interface and events */
+
@@ -50498,7 +50505,7 @@
+ return; /* Always success, I guess ;-) */
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/nl80211.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/nl80211.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,7 @@
+#ifndef __NET_WIRELESS_NL80211_H
+#define __NET_WIRELESS_NL80211_H
@@ -50508,7 +50515,7 @@
+
+#endif /* __NET_WIRELESS_NL80211_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/nl80211.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/nl80211.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,1050 @@
+/*
+ * This is the new netlink-based wireless configuration interface.
@@ -51561,7 +51568,7 @@
+ genl_unregister_family(&nl80211_fam);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/wext-old.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/wext-old.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,1730 @@
+/*
+ * This file implement the Wireless Extensions APIs.
@@ -53294,7 +53301,7 @@
+EXPORT_SYMBOL(wireless_send_event);
+EXPORT_SYMBOL(wireless_spy_update);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,16 @@
+obj-$(CONFIG_CFG80211) += cfg80211.o
+
@@ -53313,7 +53320,7 @@
+obj-$(CONFIG_CFG80211_WEXTNL_COMPAT)$(CONFIG_NET_WIRELESS) += wext-common.o
+obj-y += $(obj-yy) $(obj-yn) $(obj-ny)
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/core.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/core.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,78 @@
+/*
+ * Wireless configuration interface internals.
@@ -53394,7 +53401,7 @@
+
+#endif /* __NET_WIRELESS_CORE_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/wext-compat.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/wext-compat.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,1633 @@
+/*
+ * wireless extensions compatibility for cfg80211.
@@ -55030,7 +55037,7 @@
+ return -EINVAL;
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/wext.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/wext.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,13 @@
+/*
+ * some foo for wext compat/wext interoperability
@@ -55046,7 +55053,7 @@
+extern const int event_type_size[];
+#endif /* _WEXT_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/wireless/core.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/wireless/core.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,245 @@
+/*
+ * This is the new wireless configuration interface.
@@ -55294,7 +55301,7 @@
+module_init(cfg80211_init);
+module_exit(cfg80211_exit);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wme.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wme.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,694 @@
+/*
+ * Copyright 2004, Instant802 Networks, Inc.
@@ -55991,7 +55998,7 @@
+#endif
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/rc80211_simple.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/rc80211_simple.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,398 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -56392,7 +56399,7 @@
+MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+MODULE_LICENSE("GPL");
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wep.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wep.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,40 @@
+/*
+ * Software WEP encryption implementation
@@ -56435,7 +56442,7 @@
+
+#endif /* WEP_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/aes_ccm.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/aes_ccm.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
@@ -56602,7 +56609,7 @@
+ crypto_free_tfm(tfm);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_scan.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_scan.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -56955,7 +56962,7 @@
+ }
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/sta_info.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/sta_info.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2002-2005, Devicescape Software, Inc.
@@ -57107,7 +57114,7 @@
+
+#endif /* STA_INFO_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/michael.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/michael.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,104 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
@@ -57214,7 +57221,7 @@
+ michael_put32(r, mic + 4);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/fifo_qdisc.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/fifo_qdisc.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005, Devicescape Software, Inc.
@@ -57319,7 +57326,7 @@
+};
+
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_led.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_led.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes at sipsolutions.net>
@@ -57354,7 +57361,7 @@
+}
+#endif
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/Makefile 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/Makefile 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,26 @@
+obj-$(CONFIG_D80211) += 80211.o rc80211_simple.o
+
@@ -57383,7 +57390,7 @@
+ 80211-objs += fifo_qdisc.o
+endif
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/michael.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/michael.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,20 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
@@ -57406,7 +57413,7 @@
+
+#endif /* MICHAEL_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_ioctl.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_ioctl.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,3239 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -60648,7 +60655,7 @@
+ .standard = ieee80211_master_handler,
+};
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/aes_ccm.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/aes_ccm.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
@@ -60677,7 +60684,7 @@
+
+#endif /* AES_CCM_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/tkip.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/tkip.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -61019,7 +61026,7 @@
+
+
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_i.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_i.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,692 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -61714,7 +61721,7 @@
+
+#endif /* IEEE80211_I_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_key.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_key.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -61805,7 +61812,7 @@
+
+#endif /* IEEE80211_KEY_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_sysfs.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_sysfs.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,787 @@
+/*
+ * Copyright (c) 2006 Jiri Benc <jbenc at suse.cz>
@@ -62595,7 +62602,7 @@
+ class_unregister(&ieee80211_class);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_iface.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_iface.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,384 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -62982,7 +62989,7 @@
+ rtnl_unlock();
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_sysfs_sta.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_sysfs_sta.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2003-2005, Devicescape Software, Inc.
@@ -63422,7 +63429,7 @@
+ sysfs_remove_link(&sdata->key_kset.kobj, "default");
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/sta_info.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/sta_info.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,462 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -63887,7 +63894,7 @@
+ spin_unlock_bh(&local->sta_lock);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_dev.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_dev.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2006 Jiri Benc <jbenc at suse.cz>
@@ -64007,7 +64014,7 @@
+ ieee80211_dev_sysfs_put(local);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/hostapd_ioctl.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/hostapd_ioctl.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,434 @@
+/*
+ * Host AP (software wireless LAN access point) user space daemon for
@@ -64444,7 +64451,7 @@
+
+#endif /* HOSTAPD_IOCTL_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/Kconfig 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,69 @@
+config D80211
+ tristate "Generic IEEE 802.11 Networking Stack (dscape)"
@@ -64516,7 +64523,7 @@
+ Say Y here to print out verbose powersave
+ mode debug messages.
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wpa.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wpa.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -64553,7 +64560,7 @@
+
+#endif /* WPA_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wme.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wme.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,38 @@
+/*
+ * IEEE 802.11 driver (80211.o) - QoS datatypes
@@ -64594,7 +64601,7 @@
+
+#endif
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wep.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wep.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,322 @@
+/*
+ * Software WEP encryption implementation
@@ -64919,7 +64926,7 @@
+ return NULL;
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,4823 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -69745,7 +69752,7 @@
+MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+MODULE_LICENSE("GPL");
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_led.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_led.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes at sipsolutions.net>
@@ -69839,7 +69846,7 @@
+}
+EXPORT_SYMBOL(__ieee80211_get_rx_led_name);
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_rate.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_rate.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -69982,7 +69989,7 @@
+ kref_put(&ref->kref, rate_control_release);
+}
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/wpa.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/wpa.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,856 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -70841,7 +70848,7 @@
+}
+
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_rate.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_rate.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -71005,7 +71012,7 @@
+
+#endif /* IEEE80211_RATE_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/tkip.h 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/tkip.h 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -71043,7 +71050,7 @@
+
+#endif /* TKIP_H */
--- /dev/null 2006-11-15 09:57:50.578980680 -0500
-+++ linux-2.6.18.noarch/net/d80211/ieee80211_sta.c 2006-11-30 14:36:18.000000000 -0500
++++ linux-2.6.18.noarch/net/d80211/ieee80211_sta.c 2006-12-01 13:38:09.000000000 -0500
@@ -0,0 +1,2882 @@
+/*
+ * BSS client mode implementation
@@ -73927,8 +73934,8 @@
+ ieee80211_set_associated(dev, ifsta, 0);
+ return 0;
+}
---- linux-2.6.18.noarch/net/Kconfig.orig 2006-11-30 14:35:26.000000000 -0500
-+++ linux-2.6.18.noarch/net/Kconfig 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/Kconfig.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/Kconfig 2006-12-01 13:38:09.000000000 -0500
@@ -244,6 +244,7 @@ endmenu
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
@@ -73975,8 +73982,8 @@
endif # if NET
endmenu # Networking
---- linux-2.6.18.noarch/net/netlink/genetlink.c.orig 2006-11-30 14:35:14.000000000 -0500
-+++ linux-2.6.18.noarch/net/netlink/genetlink.c 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/netlink/genetlink.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/netlink/genetlink.c 2006-12-01 13:38:09.000000000 -0500
@@ -495,7 +495,8 @@ static struct sk_buff *ctrl_build_msg(st
static struct nla_policy ctrl_policy[CTRL_ATTR_MAX+1] __read_mostly = {
@@ -74002,8 +74009,8 @@
res = genl_family_find_byname(name);
}
---- linux-2.6.18.noarch/net/netlink/attr.c.orig 2006-11-30 14:35:13.000000000 -0500
-+++ linux-2.6.18.noarch/net/netlink/attr.c 2006-11-30 14:36:18.000000000 -0500
+--- linux-2.6.18.noarch/net/netlink/attr.c.orig 2006-12-01 13:38:01.000000000 -0500
++++ linux-2.6.18.noarch/net/netlink/attr.c 2006-12-01 13:38:09.000000000 -0500
@@ -20,7 +20,6 @@ static u16 nla_attr_minlen[NLA_TYPE_MAX+
[NLA_U16] = sizeof(u16),
[NLA_U32] = sizeof(u32),
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2849.4.1
retrieving revision 1.2849.4.2
diff -u -r1.2849.4.1 -r1.2849.4.2
--- kernel-2.6.spec 30 Nov 2006 22:08:20 -0000 1.2849.4.1
+++ kernel-2.6.spec 1 Dec 2006 18:55:30 -0000 1.2849.4.2
@@ -32,7 +32,7 @@
%define sublevel 18
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.netdev.3
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.netdev.3.1
%define signmodules 0
%define xen_hv_cset 11821
%define make_target bzImage
@@ -5327,6 +5327,9 @@
%endif
%changelog
+* Fri Dec 1 2006 John W. Linville <linville at redhat.com> [FC6.netdev.3.1]
+- fix d80211 patch so that drivers/misc/ssb.c gets built
+
* Wed Nov 29 2006 John W. Linville <linville at redhat.com> [FC6.netdev.3]
- [PATCH] wireless: add prism54usb driver
- [PATCH] prism54usb: fix build break in islusb_init.c
More information about the fedora-cvs-commits
mailing list