rpms/kernel/F-8 config-generic, 1.41, 1.42 kernel.spec, 1.309, 1.310 linux-2.6-at76.patch, 1.4, 1.5 linux-2.6-ath5k.patch, 1.9, 1.10 linux-2.6-rtl8180.patch, 1.3, 1.4 linux-2.6-wireless-pending.patch, 1.19, 1.20 linux-2.6-wireless.patch, 1.15, 1.16
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Jan 4 21:04:02 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12702
Modified Files:
config-generic kernel.spec linux-2.6-at76.patch
linux-2.6-ath5k.patch linux-2.6-rtl8180.patch
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
Log Message:
Another round of wireless fixes headed for 2.6.24 ; Another round of wireless updates headed for 2.6.25
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-generic 11 Dec 2007 21:53:39 -0000 1.41
+++ config-generic 4 Jan 2008 21:03:04 -0000 1.42
@@ -1197,6 +1197,12 @@
# CONFIG_PCMCIA_RAYCS is not set
CONFIG_MAC80211=m
+CONFIG_MAC80211_RC_DEFAULT_CHOICE=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_SIMPLE=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_HT=y
# CONFIG_MAC80211_DEBUGFS is not set
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- kernel.spec 21 Dec 2007 23:11:50 -0000 1.309
+++ kernel.spec 4 Jan 2008 21:03:04 -0000 1.310
@@ -2046,6 +2046,10 @@
%changelog
+* Fri Jan 04 2008 John W. Linville <linville at redhat.com> 2.6.23.12-101
+- Another round of wireless fixes headed for 2.6.24
+- Another round of wireless updates headed for 2.6.25
+
* Fri Dec 21 2007 Chuck Ebbert <cebbert at redhat.com> 2.6.23.12-100
- USB: Use upstream version of the Huawei USB modem fix.
linux-2.6-at76.patch:
Index: linux-2.6-at76.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-at76.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-at76.patch 8 Nov 2007 22:06:15 -0000 1.4
+++ linux-2.6-at76.patch 4 Jan 2008 21:03:04 -0000 1.5
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2007-10-19 14:41:17.000000000 -0400
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-10-19 14:45:38.000000000 -0400
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-04 15:24:46.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2008-01-04 15:27:15.000000000 -0500
@@ -685,6 +685,15 @@ W: http://www.thekelleys.org.uk/atmel
W: http://atmelwlandriver.sourceforge.net/
S: Maintained
@@ -18,8 +18,8 @@
P: David Woodhouse
M: dwmw2 at infradead.org
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/at76_usb.h
---- /dev/null 2007-10-19 09:45:41.508682727 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/at76_usb.h 2007-10-19 14:45:38.000000000 -0400
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/at76_usb.h 2008-01-04 15:27:15.000000000 -0500
@@ -0,0 +1,619 @@
+/*
+ * Copyright (c) 2002,2003 Oliver Kurth
@@ -641,8 +641,8 @@
+
+#endif /* _AT76_USB_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-10-19 14:41:17.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-10-19 14:45:38.000000000 -0400
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2008-01-04 15:24:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2008-01-04 15:27:15.000000000 -0500
@@ -32,6 +32,8 @@ obj-$(CONFIG_ATMEL) += atmel
obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o
obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o
@@ -653,8 +653,8 @@
obj-$(CONFIG_HOSTAP) += hostap/
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/at76_usb.c
---- /dev/null 2007-10-19 09:45:41.508682727 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/at76_usb.c 2007-10-19 14:45:38.000000000 -0400
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/at76_usb.c 2008-01-04 15:27:15.000000000 -0500
@@ -0,0 +1,5556 @@
+/*
+ * at76c503/at76c505 USB driver
@@ -6213,11 +6213,11 @@
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff -up linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2007-10-19 14:41:17.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2007-10-19 14:45:38.000000000 -0400
-@@ -381,6 +381,14 @@ config PCI_HERMES
- common. Some of the built-in wireless adaptors in laptops are of
- this variety.
+--- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-04 15:24:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-04 15:27:15.000000000 -0500
+@@ -445,6 +445,14 @@ config PCMCIA_ATMEL
+ Enable support for PCMCIA cards containing the
+ Atmel at76c502 and at76c504 chips.
+config USB_ATMEL
+ tristate "Atmel at76c503/at76c505/at76c505a USB cards"
@@ -6227,6 +6227,6 @@
+ Enable support for USB Wireless devices using Atmel at76c503,
+ at76c505 or at76c505a chips.
+
- config PCMCIA_HERMES
- tristate "Hermes PCMCIA card support"
- depends on PCMCIA && HERMES
+ config AIRO_CS
+ tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
+ depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
linux-2.6-ath5k.patch:
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-ath5k.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-ath5k.patch 19 Dec 2007 20:34:19 -0000 1.9
+++ linux-2.6-ath5k.patch 4 Jan 2008 21:03:04 -0000 1.10
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2007-12-19 14:38:13.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-12-19 14:46:14.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-04 15:36:06.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2008-01-04 15:36:37.000000000 -0500
@@ -642,6 +642,17 @@ M: ecashin at coraid.com
W: http://www.coraid.com/support/linux
S: Supported
@@ -20,8 +20,8 @@
P: Jay Cliburn
M: jcliburn at gmail.com
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-12-19 14:38:13.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-12-19 14:46:14.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2008-01-04 15:36:06.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2008-01-04 15:36:37.000000000 -0500
@@ -62,3 +62,5 @@ obj-$(CONFIG_RT2X00) += rt2x00/
obj-$(CONFIG_P54_COMMON) += p54common.o
obj-$(CONFIG_P54_USB) += p54usb.o
@@ -29,11 +29,11 @@
+
+obj-$(CONFIG_ATH5K) += ath5k/
diff -up linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2007-12-19 14:38:13.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2007-12-19 14:46:55.000000000 -0500
-@@ -599,6 +599,24 @@ config P54_PCI
- tristate "Prism54 PCI support"
- depends on P54_COMMON && PCI
+--- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-04 15:36:06.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-04 15:36:37.000000000 -0500
+@@ -650,6 +650,24 @@ config P54_PCI
+
+ If you choose to build a module, it'll be called p54pci.
+config ATH5K
+ tristate "Atheros 5xxx wireless cards support"
@@ -57,8 +57,8 @@
source "drivers/net/wireless/bcm43xx/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,2071 @@
+/*
+ * PHY functions
@@ -2132,8 +2132,8 @@
+ return ath5k_hw_txpower(ah, channel, power);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,1153 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
@@ -3289,14 +3289,14 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,2 @@
+ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o
+obj-$(CONFIG_ATH5K) += ath5k.o
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,1987 @@
+/*
+ * Copyright (c) 2007 Nick Kossifidis <mickflemm at gmail.com>
@@ -5286,8 +5286,8 @@
+#define AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S 18
+#define AR5K_PHY_GAIN_2GHZ_INI_5111 0x6480416c
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,500 @@
+/*
+ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at openbsd.org>
@@ -5790,8 +5790,8 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Bruno Randolf <bruno at thinktube.com>
@@ -6010,8 +6010,8 @@
+
+#endif /* ifndef _ATH5K_DEBUG_H */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,4349 @@
+ /*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
@@ -10363,8 +10363,8 @@
+ return -EIO;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,588 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
@@ -10955,8 +10955,8 @@
+ return retval;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,1347 @@
+/*
+ * Initial register settings functions
@@ -12306,8 +12306,8 @@
+ return 0;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,2822 @@
+/*-
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -15132,8 +15132,8 @@
+}
+
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2007 Bruno Randolf <bruno at thinktube.com>
@@ -15605,8 +15605,8 @@
+
+#endif /* if ATH5K_DEBUG */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,178 @@
+/*-
+ * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -15787,8 +15787,8 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c 2007-12-19 14:46:14.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c 2008-01-04 15:36:37.000000000 -0500
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
linux-2.6-rtl8180.patch:
Index: linux-2.6-rtl8180.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-rtl8180.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-rtl8180.patch 19 Dec 2007 20:34:19 -0000 1.3
+++ linux-2.6-rtl8180.patch 4 Jan 2008 21:03:04 -0000 1.4
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/include/linux/pci_ids.h.orig linux-2.6.23.noarch/include/linux/pci_ids.h
---- linux-2.6.23.noarch/include/linux/pci_ids.h.orig 2007-12-19 14:48:35.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/pci_ids.h 2007-12-19 14:49:12.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/pci_ids.h.orig 2008-01-04 15:37:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/pci_ids.h 2008-01-04 15:38:22.000000000 -0500
@@ -2059,6 +2059,9 @@
#define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea
#define PCI_DEVICE_ID_ALTIMA_AC1003 0x03eb
@@ -12,8 +12,8 @@
#define PCI_VENDOR_ID_ARECA 0x17d3
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.c 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.c 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,193 @@
+
+/*
@@ -209,13 +209,13 @@
+ rtl8180_write_phy(dev, 0x1a, 0xa0);
+}
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-12-19 14:48:36.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-12-19 14:49:12.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2008-01-04 15:37:40.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2008-01-04 15:38:22.000000000 -0500
@@ -49,7 +49,10 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs
obj-$(CONFIG_USB_ZD1201) += zd1201.o
obj-$(CONFIG_LIBERTAS) += libertas/
-+rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o
++rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o
rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o
+
+obj-$(CONFIG_RTL8180) += rtl8180.o
@@ -223,8 +223,8 @@
obj-$(CONFIG_ADM8211) += adm8211.o
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.h 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.h 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,30 @@
+#ifndef RTL8180_MAX2820_H
+#define RTL8180_MAX2820_H
@@ -257,8 +257,8 @@
+
+#endif /* RTL8180_MAX2820_H */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.h 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_sa2400.h 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,38 @@
+#ifndef RTL8180_SA2400_H
+#define RTL8180_SA2400_H
@@ -299,9 +299,9 @@
+
+#endif /* RTL8180_SA2400_H */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2007-12-19 14:49:12.000000000 -0500
-@@ -0,0 +1,765 @@
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2008-01-04 15:38:22.000000000 -0500
+@@ -0,0 +1,763 @@
+
+/*
+ * Radio tuning for RTL8225 on RTL8180
@@ -592,10 +592,6 @@
+ rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
+ rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
+
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 2, 0x42);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 6, 0x00);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 8, 0x00);
-+
+ rtl818x_iowrite8(priv, &priv->map->TX_GAIN_OFDM,
+ rtl8180_rtl8225_tx_gain_cck_ofdm[ofdm_power/6] >> 1);
+
@@ -609,10 +605,16 @@
+
+int rtl8180_rtl8225_is_z2(struct ieee80211_hw *dev)
+{
++ struct rtl8180_priv *priv = dev->priv;
+ int z2 = 0;
+
++ rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480);
++ rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x0488);
++ rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF);
++ rtl818x_ioread8(priv, &priv->map->EEPROM_CMD);
++ msleep(100);
++
+ rtl8180_rtl8225_write(dev, 0, 0x1B7);
-+ rtl8180_rtl8225_read(dev, 0);
+
+ if (rtl8180_rtl8225_read(dev, 8) == 0x588 && rtl8180_rtl8225_read(dev, 9) == 0x700)
+ z2 = 1;
@@ -693,9 +695,9 @@
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x03, 0x00); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x04, 0x00); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x05, 0x00); msleep(1);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x06, 0x40); msleep(1);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x06, 0x00); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x07, 0x00); msleep(1);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x08, 0x40); msleep(1);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x08, 0x00); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x09, 0xfe); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0a, 0x09); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0b, 0x80); msleep(1);
@@ -703,7 +705,7 @@
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0f, 0x38); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x10, 0x84); msleep(1);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x11, 0x06); msleep(1);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x11, 0x03); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x12, 0x20); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x13, 0x20); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x14, 0x00); msleep(1);
@@ -725,11 +727,6 @@
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);
+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x27, 0x88); msleep(1);
+
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0d, rtl8180_rtl8225_gain[1 * 4]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1b, rtl8180_rtl8225_gain[1 * 4 + 2]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1d, rtl8180_rtl8225_gain[1 * 4 + 3]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x23, rtl8180_rtl8225_gain[1 * 4 + 1]);
-+
+ rtl8180_rtl8225_write_phy_cck(dev, 0x00, 0x98); msleep(1);
+ rtl8180_rtl8225_write_phy_cck(dev, 0x03, 0x20); msleep(1);
+ rtl8180_rtl8225_write_phy_cck(dev, 0x04, 0x7e); msleep(1);
@@ -771,13 +768,14 @@
+ rtl818x_iowrite32(priv, (__le32 __iomem *)((void __iomem *)priv->map + 0x94), 0x15c00002);
+ rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF);
+
-+ /* set sensitivity */
+ rtl8180_rtl8225_write(dev, 0x0c, 0x50);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0d, rtl8180_rtl8225_gain[1 * 4]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1b, rtl8180_rtl8225_gain[1 * 4 + 2]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1d, rtl8180_rtl8225_gain[1 * 4 + 3]);
-+ rtl8180_rtl8225_write_phy_ofdm(dev, 0x23, rtl8180_rtl8225_gain[1 * 4 + 1]);
-+ rtl8180_rtl8225_write_phy_cck(dev, 0x41, rtl8180_rtl8225_threshold[2]);
++ /* set OFDM initial gain */
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x0d, rtl8180_rtl8225_gain[4 * 4]);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x23, rtl8180_rtl8225_gain[4 * 4 + 1]);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1b, rtl8180_rtl8225_gain[4 * 4 + 2]);
++ rtl8180_rtl8225_write_phy_ofdm(dev, 0x1d, rtl8180_rtl8225_gain[4 * 4 + 3]);
++ /* set CCK threshold */
++ rtl8180_rtl8225_write_phy_cck(dev, 0x41, rtl8180_rtl8225_threshold[0]);
+}
+
+static const u8 rtl8180_rtl8225z2_tx_power_cck_ch14[] = {
@@ -1068,8 +1066,8 @@
+ }
+}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2007-12-19 14:48:36.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c 2007-12-19 14:49:12.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-01-04 15:37:39.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c 2008-01-04 15:38:22.000000000 -0500
@@ -396,12 +396,12 @@ static int rtl8187_init_hw(struct ieee80
priv->rf_init(dev);
@@ -1104,8 +1102,8 @@
rtl8225_write(dev, 0, 0x1B7);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h.orig linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h
---- linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h.orig 2007-12-19 14:48:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h 2007-12-19 14:49:12.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h.orig 2008-01-04 15:37:39.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl818x.h 2008-01-04 15:38:22.000000000 -0500
@@ -58,13 +58,17 @@ struct rtl818x_csr {
#define RTL818X_INT_TX_FO (1 << 15)
__le32 TX_CONF;
@@ -1178,10 +1176,186 @@
u8 TALLY_SEL;
} __attribute__((packed));
+diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_grf5101.c
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_grf5101.c 2008-01-04 15:38:22.000000000 -0500
+@@ -0,0 +1,172 @@
++
++/*
++ * Radio tuning for GCT GRF5101 on RTL8180
++ *
++ * Copyright 2007 Andrea Merello <andreamrl at tiscali.it>
++ *
++ * Code from the BSD driver and the rtl8181 project have been
++ * very useful to understand certain things
++ *
++ * I want to thanks the Authors of such projects and the Ndiswrapper
++ * project Authors.
++ *
++ * A special Big Thanks also is for all people who donated me cards,
++ * making possible the creation of the original rtl8180 driver
++ * from which this code is derived!
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/init.h>
++#include <linux/pci.h>
++#include <linux/delay.h>
++#include <net/mac80211.h>
++
++#include "rtl8180.h"
++#include "rtl8180_grf5101.h"
++
++static const int grf5101_encode[] = {
++ 0x0, 0x8, 0x4, 0xC,
++ 0x2, 0xA, 0x6, 0xE,
++ 0x1, 0x9, 0x5, 0xD,
++ 0x3, 0xB, 0x7, 0xF
++};
++
++static void write_grf5101(struct ieee80211_hw *dev, u8 addr, u32 data)
++{
++ struct rtl8180_priv *priv = dev->priv;
++ u32 phy_config;
++
++ phy_config = grf5101_encode[(data >> 8) & 0xF];
++ phy_config |= grf5101_encode[(data >> 4) & 0xF] << 4;
++ phy_config |= grf5101_encode[data & 0xF] << 8;
++ phy_config |= grf5101_encode[(addr >> 1) & 0xF] << 12;
++ phy_config |= (addr & 1) << 16;
++ phy_config |= grf5101_encode[(data & 0xf000) >> 12] << 24;
++
++ /* MAC will bang bits to the chip */
++ phy_config |= 0x90000000;
++
++ rtl818x_iowrite32(priv,
++ (__le32 __iomem *) &priv->map->RFPinsOutput, phy_config);
++
++ msleep(3);
++}
++
++static void grf5101_write_phy_antenna(struct ieee80211_hw *dev, short chan)
++{
++ struct rtl8180_priv *priv = dev->priv;
++ u8 ant = GRF5101_ANTENNA;
++
++ if (priv->rfparam & RF_PARAM_ANTBDEFAULT)
++ ant |= BB_ANTENNA_B;
++
++ if (chan == 14)
++ ant |= BB_ANTATTEN_CHAN14;
++
++ rtl8180_write_phy(dev, 0x10, ant);
++}
++
++void grf5101_rf_set_channel(struct ieee80211_hw *dev,
++ struct ieee80211_conf *conf)
++{
++ struct rtl8180_priv *priv = dev->priv;
++ u32 txpw = priv->channels[conf->channel - 1].val & 0xFF;
++ u32 chan = conf->channel - 1;
++
++ /* set TX power */
++ write_grf5101(dev, 0x15, 0x0);
++ write_grf5101(dev, 0x06, txpw);
++ write_grf5101(dev, 0x15, 0x10);
++ write_grf5101(dev, 0x15, 0x0);
++
++ /* set frequency */
++ write_grf5101(dev, 0x07, 0x0);
++ write_grf5101(dev, 0x0B, chan);
++ write_grf5101(dev, 0x07, 0x1000);
++
++ grf5101_write_phy_antenna(dev, chan);
++}
++
++void grf5101_rf_stop(struct ieee80211_hw *dev)
++{
++ struct rtl8180_priv *priv = dev->priv;
++ u32 anaparam;
++
++ anaparam = priv->anaparam;
++ anaparam &= 0x000fffff;
++ anaparam |= 0x3f900000;
++ rtl8180_set_anaparam(priv, anaparam);
++
++ write_grf5101(dev, 0x07, 0x0);
++ write_grf5101(dev, 0x1f, 0x45);
++ write_grf5101(dev, 0x1f, 0x5);
++ write_grf5101(dev, 0x00, 0x8e4);
++}
++
++void grf5101_rf_init(struct ieee80211_hw *dev)
++{
++ struct rtl8180_priv *priv = dev->priv;
++
++ rtl8180_set_anaparam(priv, priv->anaparam);
++
++ write_grf5101(dev, 0x1f, 0x0);
++ write_grf5101(dev, 0x1f, 0x0);
++ write_grf5101(dev, 0x1f, 0x40);
++ write_grf5101(dev, 0x1f, 0x60);
++ write_grf5101(dev, 0x1f, 0x61);
++ write_grf5101(dev, 0x1f, 0x61);
++ write_grf5101(dev, 0x00, 0xae4);
++ write_grf5101(dev, 0x1f, 0x1);
++ write_grf5101(dev, 0x1f, 0x41);
++ write_grf5101(dev, 0x1f, 0x61);
++
++ write_grf5101(dev, 0x01, 0x1a23);
++ write_grf5101(dev, 0x02, 0x4971);
++ write_grf5101(dev, 0x03, 0x41de);
++ write_grf5101(dev, 0x04, 0x2d80);
++ write_grf5101(dev, 0x05, 0x68ff); /* 0x61ff original value */
++ write_grf5101(dev, 0x06, 0x0);
++ write_grf5101(dev, 0x07, 0x0);
++ write_grf5101(dev, 0x08, 0x7533);
++ write_grf5101(dev, 0x09, 0xc401);
++ write_grf5101(dev, 0x0a, 0x0);
++ write_grf5101(dev, 0x0c, 0x1c7);
++ write_grf5101(dev, 0x0d, 0x29d3);
++ write_grf5101(dev, 0x0e, 0x2e8);
++ write_grf5101(dev, 0x10, 0x192);
++ write_grf5101(dev, 0x11, 0x248);
++ write_grf5101(dev, 0x12, 0x0);
++ write_grf5101(dev, 0x13, 0x20c4);
++ write_grf5101(dev, 0x14, 0xf4fc);
++ write_grf5101(dev, 0x15, 0x0);
++ write_grf5101(dev, 0x16, 0x1500);
++
++ write_grf5101(dev, 0x07, 0x1000);
++
++ /* baseband configuration */
++ rtl8180_write_phy(dev, 0, 0xa8);
++ rtl8180_write_phy(dev, 3, 0x0);
++ rtl8180_write_phy(dev, 4, 0xc0);
++ rtl8180_write_phy(dev, 5, 0x90);
++ rtl8180_write_phy(dev, 6, 0x1e);
++ rtl8180_write_phy(dev, 7, 0x64);
++
++ grf5101_write_phy_antenna(dev, 1);
++
++ rtl8180_write_phy(dev, 0x11, 0x88);
++
++ if (rtl818x_ioread8(priv, &priv->map->CONFIG2) &
++ RTL818X_CONFIG2_ANTENNA_DIV)
++ rtl8180_write_phy(dev, 0x12, 0xc0); /* enable ant diversity */
++ else
++ rtl8180_write_phy(dev, 0x12, 0x40); /* disable ant diversity */
++
++ rtl8180_write_phy(dev, 0x13, 0x90 | priv->csthreshold);
++
++ rtl8180_write_phy(dev, 0x19, 0x0);
++ rtl8180_write_phy(dev, 0x1a, 0xa0);
++ rtl8180_write_phy(dev, 0x1b, 0x44);
++}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c 2007-12-19 14:52:01.000000000 -0500
-@@ -0,0 +1,1053 @@
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c 2008-01-04 15:44:01.000000000 -0500
+@@ -0,0 +1,1070 @@
+
+/*
+ * Linux device driver for RTL8180 / RTL8185
@@ -1210,6 +1384,7 @@
+#include "rtl8180_rtl8225.h"
+#include "rtl8180_sa2400.h"
+#include "rtl8180_max2820.h"
++#include "rtl8180_grf5101.h"
+
+MODULE_AUTHOR("Michael Wu <flamingice at sourmilk.net>");
+MODULE_AUTHOR("Andrea Merello <andreamrl at tiscali.it>");
@@ -1287,6 +1462,9 @@
+ rx_status.phymode = dev->conf.phymode;
+ rx_status.mactime = le64_to_cpu(entry->tsft);
+ rx_status.flag |= RX_FLAG_TSFT;
++ if (flags & RTL8180_RX_DESC_FLAG_CRC32_ERR)
++ rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
++
+ ieee80211_rx_irqsafe(dev, skb, &rx_status);
+
+ skb = new_skb;
@@ -1390,6 +1568,8 @@
+ unsigned int idx, prio;
+ dma_addr_t mapping;
+ u32 tx_flags;
++ u16 plcp_len = 0;
++ __le16 rts_duration = 0;
+
+ prio = control->queue;
+ ring = &priv->tx_ring[prio];
@@ -1413,24 +1593,26 @@
+ *((struct ieee80211_tx_control **) skb->cb) =
+ kmemdup(control, sizeof(*control), GFP_ATOMIC);
+
-+ spin_lock_irqsave(&priv->lock, flags);
-+ idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
-+ entry = &ring->desc[idx];
-+
+ if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
-+ entry->rts_duration =
-+ ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
++ rts_duration = ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
+
+ if (!priv->r8185) {
+ unsigned int remainder;
+
-+ entry->plcp_len =
-+ DIV_ROUND_UP(16 * (skb->len + 4), (control->rate->rate * 2) / 10);
-+ remainder = (16 * (skb->len + 4)) % ((control->rate->rate * 2) / 10);
++ plcp_len = DIV_ROUND_UP(16 * (skb->len + 4),
++ (control->rate->rate * 2) / 10);
++ remainder = (16 * (skb->len + 4)) %
++ ((control->rate->rate * 2) / 10);
+ if (remainder > 0 && remainder <= 6)
-+ entry->plcp_len |= 1 << 15;
++ plcp_len |= 1 << 15;
+ }
+
++ spin_lock_irqsave(&priv->lock, flags);
++ idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
++ entry = &ring->desc[idx];
++
++ entry->rts_duration = rts_duration;
++ entry->plcp_len = cpu_to_le16(plcp_len);
+ entry->tx_buf = cpu_to_le32(mapping);
+ entry->frame_len = cpu_to_le32(skb->len);
+ entry->flags2 = control->alt_retry_rate != -1 ?
@@ -1551,7 +1733,8 @@
+ }
+
+ priv->rf_init(dev);
-+ rtl818x_iowrite16(priv, &priv->map->BRSR, 0x01F3);
++ if (priv->r8185)
++ rtl818x_iowrite16(priv, &priv->map->BRSR, 0x01F3);
+ return 0;
+}
+
@@ -1785,6 +1968,11 @@
+
+ priv->rf_stop(dev);
+
++ rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
++ reg = rtl818x_ioread8(priv, &priv->map->CONFIG4);
++ rtl818x_iowrite8(priv, &priv->map->CONFIG4, reg | RTL818X_CONFIG4_VCOOFF);
++ rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
++
+ free_irq(priv->pdev->irq, dev);
+
+ rtl8180_free_rx_ring(dev);
@@ -2086,6 +2274,9 @@
+ break;
+ case 5:
+ rf_name = "GCT";
++ priv->rf_init = grf5101_rf_init;
++ priv->rf_stop = grf5101_rf_stop;
++ priv->rf_set_chan = grf5101_rf_set_channel;
+ break;
+ case 9:
+ if (rtl8180_rtl8225_is_z2(dev)) {
@@ -2236,8 +2427,8 @@
+module_init(rtl8180_init);
+module_exit(rtl8180_exit);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,153 @@
+#ifndef RTL8180_H
+#define RTL8180_H
@@ -2393,8 +2584,8 @@
+
+#endif /* RTL8180_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2007-12-19 14:48:36.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2007-12-19 14:49:12.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-04 15:37:40.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-04 15:38:22.000000000 -0500
@@ -547,6 +547,11 @@ config USB_ZD1201
To compile this driver as a module, choose M here: the
module will be called zd1201.
@@ -2408,8 +2599,8 @@
tristate "Realtek 8187 USB support"
depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.h 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_rtl8225.h 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,28 @@
+#ifndef RTL8180_RTL8225_H
+#define RTL8180_RTL8225_H
@@ -2439,9 +2630,43 @@
+}
+
+#endif /* RTL8180_RTL8225_H */
+diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_grf5101.h
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_grf5101.h 2008-01-04 15:38:22.000000000 -0500
+@@ -0,0 +1,30 @@
++#ifndef RTL8180_GRF5101_H
++#define RTL8180_GRF5101_H
++
++/*
++ * Radio tuning for GCT GRF5101 on RTL8180
++ *
++ * Copyright 2007 Andrea Merello <andreamrl at tiscali.it>
++ *
++ * Code from the BSD driver and the rtl8181 project have been
++ * very useful to understand certain things
++ *
++ * I want to thanks the Authors of such projects and the Ndiswrapper
++ * project Authors.
++ *
++ * A special Big Thanks also is for all people who donated me cards,
++ * making possible the creation of the original rtl8180 driver
++ * from which this code is derived!
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#define GRF5101_ANTENNA 0xA3
++
++void grf5101_rf_init(struct ieee80211_hw *);
++void grf5101_rf_stop(struct ieee80211_hw *);
++void grf5101_rf_set_channel(struct ieee80211_hw *, struct ieee80211_conf *);
++
++#endif /* RTL8180_GRF5101_H */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.c
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.c 2007-12-19 14:49:12.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-01-04 15:38:22.000000000 -0500
@@ -0,0 +1,142 @@
+/*
+ * Radio tuning for Maxim max2820 on RTL8180
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.19 -r 1.20 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-wireless-pending.patch 19 Dec 2007 20:34:19 -0000 1.19
+++ linux-2.6-wireless-pending.patch 4 Jan 2008 21:03:04 -0000 1.20
@@ -1,6 +1,209 @@
+diff -up linux-2.6.23.noarch/include/linux/nl80211.h.orig linux-2.6.23.noarch/include/linux/nl80211.h
+--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-04 14:43:19.000000000 -0500
+@@ -7,6 +7,18 @@
+ */
+
+ /**
++ * DOC: Station handling
++ *
++ * Stations are added per interface, but a special case exists with VLAN
++ * interfaces. When a station is bound to an AP interface, it may be moved
++ * into a VLAN identified by a VLAN interface index (%NL80211_ATTR_STA_VLAN).
++ * The station is still assumed to belong to the AP interface it was added
++ * to.
++ *
++ * TODO: need more info?
++ */
++
++/**
+ * enum nl80211_commands - supported nl80211 commands
+ *
+ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
+@@ -37,6 +49,35 @@
+ * userspace to request deletion of a virtual interface, then requires
+ * attribute %NL80211_ATTR_IFINDEX.
+ *
++ * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
++ * by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
++ * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or
++ * %NL80211_ATTR_KEY_THRESHOLD.
++ * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
++ * %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER
++ * attributes.
++ * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
++ * or %NL80211_ATTR_MAC.
++ *
++ * @NL80211_CMD_GET_BEACON: retrieve beacon information (returned in a
++ * %NL80222_CMD_NEW_BEACON message)
++ * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
++ * using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
++ * %NL80211_BEACON_HEAD and %NL80211_BEACON_TAIL attributes.
++ * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
++ * parameters are like for %NL80211_CMD_SET_BEACON.
++ * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
++ *
++ * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
++ * %NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
++ * @NL80211_CMD_SET_STATION: Set station attributes for station identified by
++ * %NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
++ * @NL80211_CMD_NEW_STATION: Add a station with given attributes to the
++ * the interface identified by %NL80211_ATTR_IFINDEX.
++ * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
++ * or, if no MAC address given, all stations, on the interface identified
++ * by %NL80211_ATTR_IFINDEX.
++ *
+ * @NL80211_CMD_MAX: highest used command number
+ * @__NL80211_CMD_AFTER_LAST: internal use
+ */
+@@ -54,6 +95,21 @@ enum nl80211_commands {
+ NL80211_CMD_NEW_INTERFACE,
+ NL80211_CMD_DEL_INTERFACE,
+
++ NL80211_CMD_GET_KEY,
++ NL80211_CMD_SET_KEY,
++ NL80211_CMD_NEW_KEY,
++ NL80211_CMD_DEL_KEY,
++
++ NL80211_CMD_GET_BEACON,
++ NL80211_CMD_SET_BEACON,
++ NL80211_CMD_NEW_BEACON,
++ NL80211_CMD_DEL_BEACON,
++
++ NL80211_CMD_GET_STATION,
++ NL80211_CMD_SET_STATION,
++ NL80211_CMD_NEW_STATION,
++ NL80211_CMD_DEL_STATION,
++
+ /* add commands here */
+
+ /* used to define NL80211_CMD_MAX below */
+@@ -75,6 +131,36 @@ enum nl80211_commands {
+ * @NL80211_ATTR_IFNAME: network interface name
+ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
+ *
++ * @NL80211_ATTR_MAC: MAC address (various uses)
++ *
++ * @NL80211_ATTR_KEY_DATA: (temporal) key data; for TKIP this consists of
++ * 16 bytes encryption key followed by 8 bytes each for TX and RX MIC
++ * keys
++ * @NL80211_ATTR_KEY_IDX: key ID (u8, 0-3)
++ * @NL80211_ATTR_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
++ * section 7.3.2.25.1, e.g. 0x000FAC04)
++ * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
++ * CCMP keys, each six bytes in little endian
++ *
++ * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
++ * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
++ * @NL80211_ATTR_BEACON_HEAD: portion of the beacon before the TIM IE
++ * @NL80211_ATTR_BEACON_TAIL: portion of the beacon after the TIM IE
++ *
++ * @NL80211_ATTR_STA_AID: Association ID for the station (u16)
++ * @NL80211_ATTR_STA_FLAGS: flags, nested element with NLA_FLAG attributes of
++ * &enum nl80211_sta_flags.
++ * @NL80211_ATTR_STA_LISTEN_INTERVAL: listen interval as defined by
++ * IEEE 802.11 7.3.1.6 (u16).
++ * @NL80211_ATTR_STA_SUPPORTED_RATES: supported rates, array of supported
++ * rates as defined by IEEE 802.11 7.3.2.2 but without the length
++ * restriction (at most %NL80211_MAX_SUPP_RATES).
++ * @NL80211_ATTR_STA_VLAN: interface index of VLAN interface to move station
++ * to, or the AP interface the station was originally added to to.
++ * @NL80211_ATTR_STA_STATS: statistics for a station, part of station info
++ * given for %NL80211_CMD_GET_STATION, nested attribute containing
++ * info as possible, see &enum nl80211_sta_stats.
++ *
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+ */
+@@ -89,12 +175,34 @@ enum nl80211_attrs {
+ NL80211_ATTR_IFNAME,
+ NL80211_ATTR_IFTYPE,
+
++ NL80211_ATTR_MAC,
++
++ NL80211_ATTR_KEY_DATA,
++ NL80211_ATTR_KEY_IDX,
++ NL80211_ATTR_KEY_CIPHER,
++ NL80211_ATTR_KEY_SEQ,
++ NL80211_ATTR_KEY_DEFAULT,
++
++ NL80211_ATTR_BEACON_INTERVAL,
++ NL80211_ATTR_DTIM_PERIOD,
++ NL80211_ATTR_BEACON_HEAD,
++ NL80211_ATTR_BEACON_TAIL,
++
++ NL80211_ATTR_STA_AID,
++ NL80211_ATTR_STA_FLAGS,
++ NL80211_ATTR_STA_LISTEN_INTERVAL,
++ NL80211_ATTR_STA_SUPPORTED_RATES,
++ NL80211_ATTR_STA_VLAN,
++ NL80211_ATTR_STA_STATS,
++
+ /* add attributes here, update the policy in nl80211.c */
+
+ __NL80211_ATTR_AFTER_LAST,
+ NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
+ };
+
++#define NL80211_MAX_SUPP_RATES 32
++
+ /**
+ * enum nl80211_iftype - (virtual) interface types
+ *
+@@ -126,4 +234,50 @@ enum nl80211_iftype {
+ NL80211_IFTYPE_MAX = __NL80211_IFTYPE_AFTER_LAST - 1
+ };
+
++/**
++ * enum nl80211_sta_flags - station flags
++ *
++ * Station flags. When a station is added to an AP interface, it is
++ * assumed to be already associated (and hence authenticated.)
++ *
++ * @NL80211_STA_FLAG_AUTHORIZED: station is authorized (802.1X)
++ * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
++ * with short barker preamble
++ * @NL80211_STA_FLAG_WME: station is WME/QoS capable
++ */
++enum nl80211_sta_flags {
++ __NL80211_STA_FLAG_INVALID,
++ NL80211_STA_FLAG_AUTHORIZED,
++ NL80211_STA_FLAG_SHORT_PREAMBLE,
++ NL80211_STA_FLAG_WME,
++
++ /* keep last */
++ __NL80211_STA_FLAG_AFTER_LAST,
++ NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
++};
++
++/**
++ * enum nl80211_sta_stats - station statistics
++ *
++ * These attribute types are used with %NL80211_ATTR_STA_STATS
++ * when getting information about a station.
++ *
++ * @__NL80211_STA_STAT_INVALID: attribute number 0 is reserved
++ * @NL80211_STA_STAT_INACTIVE_TIME: time since last activity (u32, msecs)
++ * @NL80211_STA_STAT_RX_BYTES: total received bytes (u32, from this station)
++ * @NL80211_STA_STAT_TX_BYTES: total transmitted bytes (u32, to this station)
++ * @__NL80211_STA_STAT_AFTER_LAST: internal
++ * @NL80211_STA_STAT_MAX: highest possible station stats attribute
++ */
[...22928 lines suppressed...]
/*
* DMA descriptor defines.
@@ -65469,8 +70538,8 @@
/*
* Word5
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2008-01-04 14:14:50.000000000 -0500
@@ -430,10 +430,21 @@
/*
@@ -65506,8 +70575,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2008-01-04 14:14:50.000000000 -0500
@@ -1082,8 +1082,8 @@
/*
* DMA descriptor defines.
@@ -65520,8 +70589,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-01-04 14:14:50.000000000 -0500
@@ -23,11 +23,6 @@
Abstract: rt2x00 rfkill routines.
*/
@@ -65607,8 +70676,8 @@
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h
---- /dev/null 2007-12-19 09:04:26.531266789 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2007-12-19 13:33:39.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2008-01-04 14:14:50.000000000 -0500
@@ -0,0 +1,121 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -65732,8 +70801,8 @@
+
+#endif /* RT2X00DUMP_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2008-01-04 14:14:50.000000000 -0500
@@ -23,11 +23,6 @@
Abstract: rt2x00 firmware loading routines.
*/
@@ -65747,8 +70816,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-01-04 14:14:50.000000000 -0500
@@ -24,11 +24,6 @@
Supported chipsets: RT2560.
*/
@@ -66095,8 +71164,8 @@
.probe = rt2x00pci_probe,
.remove = __devexit_p(rt2x00pci_remove),
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-04 14:14:50.000000000 -0500
@@ -24,11 +24,6 @@
Supported chipsets: RT2561, RT2561s, RT2661.
*/
@@ -66833,8 +71902,8 @@
.probe = rt2x00pci_probe,
.remove = __devexit_p(rt2x00pci_remove),
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-01-04 14:14:50.000000000 -0500
@@ -23,11 +23,6 @@
Abstract: rt2x00 generic pci device routines.
*/
@@ -67008,8 +72077,8 @@
* Device initialization handlers.
*/
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-01-04 14:14:50.000000000 -0500
@@ -57,7 +57,7 @@
/*
* Register access.
@@ -67059,8 +72128,8 @@
/*
* Device initialization handlers.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-04 14:14:50.000000000 -0500
@@ -24,11 +24,6 @@
Supported chipsets: rt2571W & rt2671.
*/
@@ -67618,8 +72687,8 @@
.probe = rt2x00usb_probe,
.disconnect = rt2x00usb_disconnect,
diff -up linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2008-01-04 14:14:50.000000000 -0500
@@ -141,6 +141,7 @@ static irqreturn_t p54p_simple_interrupt
static int p54p_read_eeprom(struct ieee80211_hw *dev)
{
@@ -67841,8 +72910,8 @@
static int __devinit p54p_probe(struct pci_dev *pdev,
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-12-19 14:14:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-04 14:14:50.000000000 -0500
@@ -1091,6 +1091,9 @@ static int prism2_ioctl_giwrange(struct
range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
@@ -67854,8 +72923,8 @@
}
diff -up linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-04 14:14:50.000000000 -0500
@@ -27,6 +27,7 @@ static const struct pci_device_id b43_pc
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
@@ -67865,8 +72934,8 @@
};
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff -up linux-2.6.23.noarch/drivers/ssb/main.c.orig linux-2.6.23.noarch/drivers/ssb/main.c
---- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-04 14:14:50.000000000 -0500
@@ -877,14 +877,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
@@ -67892,8 +72961,8 @@
}
return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
diff -up linux-2.6.23.noarch/drivers/ssb/pci.c.orig linux-2.6.23.noarch/drivers/ssb/pci.c
---- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2007-12-19 13:32:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-12-19 13:33:39.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-04 14:14:50.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -68284,9 +73353,9 @@
err = -EINVAL;
goto out_kfree;
diff -up linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2007-12-19 13:32:41.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2007-12-19 13:33:39.000000000 -0500
-@@ -316,3 +316,20 @@ Why: powermac supports proper generic pm
+--- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-04 14:04:11.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-04 14:43:19.000000000 -0500
+@@ -316,3 +316,28 @@ Why: powermac supports proper generic pm
Who: Johannes Berg <johannes at sipsolutions.net>
---------------------------
@@ -68300,10 +73369,18 @@
+
+---------------------------
+
-+What: iee80211 softmac wireless networking component
++What: ieee80211 softmac wireless networking component
+When: 2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
+Files: net/ieee80211/softmac
+Why: No in-kernel drivers will depend on it any longer.
+Who: John W. Linville <linville at tuxdriver.com>
+
+---------------------------
++
++What: rc80211-simple rate control algorithm for mac80211
++When: 2.6.26
++Files: net/mac80211/rc80211-simple.c
++Why: This algorithm was provided for reference but always exhibited bad
++ responsiveness and performance and has some serious flaws. It has been
++ replaced by rc80211-pid.
++Who: Stefano Brivio <stefano.brivio at polimi.it>
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.15 -r 1.16 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-wireless.patch 19 Dec 2007 20:34:21 -0000 1.15
+++ linux-2.6-wireless.patch 4 Jan 2008 21:03:05 -0000 1.16
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/CREDITS.orig linux-2.6.23.noarch/CREDITS
---- linux-2.6.23.noarch/CREDITS.orig 2007-12-17 21:50:24.000000000 -0500
-+++ linux-2.6.23.noarch/CREDITS 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/CREDITS.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/CREDITS 2008-01-04 13:54:57.000000000 -0500
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -68,8 +68,8 @@
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
diff -up linux-2.6.23.noarch/include/linux/nl80211.h.orig linux-2.6.23.noarch/include/linux/nl80211.h
---- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-04 13:54:57.000000000 -0500
@@ -7,7 +7,97 @@
*/
@@ -192,8 +192,8 @@
#endif /* __LINUX_NL80211_H */
diff -up linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig linux-2.6.23.noarch/include/linux/mod_devicetable.h
---- linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2008-01-04 13:54:57.000000000 -0500
@@ -340,4 +340,19 @@ struct parisc_device_id {
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -215,8 +215,8 @@
+
#endif /* LINUX_MOD_DEVICETABLE_H */
diff -up linux-2.6.23.noarch/include/linux/ieee80211.h.orig linux-2.6.23.noarch/include/linux/ieee80211.h
---- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-04 13:54:57.000000000 -0500
@@ -16,6 +16,7 @@
#define IEEE80211_H
@@ -291,8 +291,8 @@
+
#endif /* IEEE80211_H */
diff -up linux-2.6.23.noarch/include/linux/rfkill.h.orig linux-2.6.23.noarch/include/linux/rfkill.h
---- linux-2.6.23.noarch/include/linux/rfkill.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/rfkill.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/rfkill.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/rfkill.h 2008-01-04 13:54:57.000000000 -0500
@@ -2,7 +2,7 @@
#define __RFKILL_H
@@ -375,8 +375,8 @@
#endif /* RFKILL_H */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,396 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -775,8 +775,8 @@
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -983,8 +983,8 @@
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1033,8 +1033,8 @@
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1329,8 +1329,8 @@
+
+#endif /* LINUX_SSB_REGS_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1439,8 +1439,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-04 13:54:57.000000000 -0500
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -1867,8 +1867,8 @@
+
+#endif /* LINUX_SSB_H_ */
diff -up linux-2.6.23.noarch/include/net/cfg80211.h.orig linux-2.6.23.noarch/include/net/cfg80211.h
---- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/cfg80211.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-04 13:54:57.000000000 -0500
@@ -3,15 +3,15 @@
#include <linux/netlink.h>
@@ -1906,8 +1906,8 @@
#endif /* __NET_CFG80211_H */
diff -up linux-2.6.23.noarch/include/net/ieee80211.h.orig linux-2.6.23.noarch/include/net/ieee80211.h
---- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-04 13:54:57.000000000 -0500
@@ -115,8 +115,16 @@ extern u32 ieee80211_debug_level;
do { if (ieee80211_debug_level & (level)) \
printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
@@ -1926,8 +1926,8 @@
/* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
diff -up linux-2.6.23.noarch/include/net/mac80211.h.orig linux-2.6.23.noarch/include/net/mac80211.h
---- linux-2.6.23.noarch/include/net/mac80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-04 13:54:57.000000000 -0500
@@ -1,7 +1,9 @@
/*
- * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -3618,8 +3618,8 @@
#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
diff -up linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig linux-2.6.23.noarch/include/net/ieee80211softmac.h
---- linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2008-01-04 13:54:57.000000000 -0500
@@ -229,6 +229,8 @@ struct ieee80211softmac_device {
/* this lock protects this structure */
spinlock_t lock;
@@ -3630,8 +3630,8 @@
u8 scanning;
diff -up linux-2.6.23.noarch/include/net/iw_handler.h.orig linux-2.6.23.noarch/include/net/iw_handler.h
---- linux-2.6.23.noarch/include/net/iw_handler.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/iw_handler.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/iw_handler.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/iw_handler.h 2008-01-04 13:54:57.000000000 -0500
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -3648,8 +3648,8 @@
/* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev,
diff -up linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig linux-2.6.23.noarch/include/net/ieee80211_radiotap.h
---- linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig 2008-01-04 13:54:52.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2008-01-04 13:54:57.000000000 -0500
@@ -40,6 +40,7 @@
#include <linux/if_ether.h>
@@ -3673,8 +3673,8 @@
+
#endif /* IEEE80211_RADIOTAP_H */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2007-12-17 21:50:24.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-12-17 21:55:14.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-04 13:54:52.000000000 -0500
[...3247 lines suppressed...]
{
int res, ret = 0;
@@ -131175,8 +131269,8 @@
};
MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-01-04 13:54:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-04 13:54:58.000000000 -0500
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -131256,8 +131350,8 @@
/* Send disconnect event, e.g., to trigger reassociation after resume
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-01-04 13:54:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-04 13:54:58.000000000 -0500
@@ -72,7 +72,7 @@ struct net_device * hostap_add_interface
dev->mem_start = mdev->mem_start;
dev->mem_end = mdev->mem_end;
@@ -131313,8 +131407,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-04 13:54:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-04 13:54:58.000000000 -0500
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
size_t len)
@@ -131379,8 +131473,8 @@
struct iw_mlme *mlme = (struct iw_mlme *) extra;
u16 reason;
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig 2008-01-04 13:54:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2008-01-04 13:54:58.000000000 -0500
@@ -35,7 +35,7 @@ int hostap_80211_prism_header_parse(stru
int hostap_80211_get_hdrlen(u16 fc);
struct net_device_stats *hostap_get_stats(struct net_device *dev);
@@ -131391,8 +131485,8 @@
int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,48 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -131443,8 +131537,8 @@
+ ssb_pcihost_unregister(&b43_pci_bridge_driver);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Makefile
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Makefile 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Makefile 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,18 @@
+# core
+ssb-y += main.o scan.o
@@ -131465,8 +131559,8 @@
+
+obj-$(CONFIG_SSB) += ssb.o
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcmcia.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -131740,8 +131834,8 @@
+ return -ENODEV;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/main.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,1166 @@
+/*
+ * Sonics Silicon Backplane
@@ -132910,8 +133004,8 @@
+}
+module_exit(ssb_modexit)
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -133018,8 +133112,8 @@
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,224 @@
+/*
+ * Sonics Silicon Backplane
@@ -133246,8 +133340,8 @@
+ ssb_mips_flash_detect(mcore);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/ssb_private.h
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -133386,8 +133480,8 @@
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pci.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -134130,8 +134224,8 @@
+ return err;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,445 @@
+/*
+ * Sonics Silicon Backplane
@@ -134579,8 +134673,8 @@
+}
+#endif /* CONFIG_SSB_SERIAL */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Kconfig
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -134700,8 +134794,8 @@
+
+endmenu
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/scan.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/scan.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/scan.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -135117,8 +135211,8 @@
+ goto out;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_extif.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -135250,8 +135344,8 @@
+}
+
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c
---- /dev/null 2007-12-17 20:19:39.791204620 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2007-12-17 21:53:57.000000000 -0500
+--- /dev/null 2008-01-04 08:33:07.585415225 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2008-01-04 13:54:58.000000000 -0500
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
@@ -135830,8 +135924,8 @@
+}
+EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);
diff -up linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt
---- linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2007-12-17 21:53:57.000000000 -0500
+--- linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig 2008-01-04 13:54:53.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2008-01-04 13:54:58.000000000 -0500
@@ -13,15 +13,35 @@ The radiotap format is discussed in
./Documentation/networking/radiotap-headers.txt.
More information about the fedora-extras-commits
mailing list