rpms/kernel/devel kernel.spec, 1.192, 1.193 linux-2.6-wireless-pending.patch, 1.5, 1.6 linux-2.6-zd1211rw-mac80211.patch, 1.1, 1.2
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Sep 27 14:37:38 UTC 2007
- Previous message: rpms/straw/devel Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec, 1.8, 1.9 dead.package, 1.1, NONE
- Next message: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4, 1.5 kernel-2.6.21-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec, 1.60, 1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4013
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
linux-2.6-zd1211rw-mac80211.patch
Log Message:
Fix-up botched wireless patch restructuring...
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kernel.spec 27 Sep 2007 00:43:33 -0000 1.192
+++ kernel.spec 27 Sep 2007 14:37:05 -0000 1.193
@@ -1815,6 +1815,9 @@
%changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- Fix-up botched wireless patch restructuring...
+
* Wed Sep 26 2007 John W. Linville <linville at redhat.com>
- Update and restructure wireless patches
linux-2.6-wireless-pending.patch:
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-wireless-pending.patch 27 Sep 2007 00:43:34 -0000 1.5
+++ linux-2.6-wireless-pending.patch 27 Sep 2007 14:37:05 -0000 1.6
@@ -66352,7 +66352,7 @@
config PCMCIA_WL3501
tristate "Planet WL3501 PCMCIA cards"
depends on EXPERIMENTAL && PCMCIA && WLAN_80211
-@@ -558,8 +550,51 @@ config RTL8187
+@@ -558,8 +550,52 @@ config RTL8187
Thanks to Realtek for their support!
@@ -66402,6 +66402,7 @@
+source "drivers/net/wireless/b43legacy/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"
++source "drivers/net/wireless/iwlwifi/Kconfig"
endmenu
diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
linux-2.6-zd1211rw-mac80211.patch:
Index: linux-2.6-zd1211rw-mac80211.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-zd1211rw-mac80211.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-zd1211rw-mac80211.patch 27 Sep 2007 00:43:34 -0000 1.1
+++ linux-2.6-zd1211rw-mac80211.patch 27 Sep 2007 14:37:05 -0000 1.2
@@ -1,11 +1,11 @@
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig 2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig 2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS 2007-09-27 09:59:55.000000000 -0400
@@ -4287,6 +4287,16 @@ W: http://www.qsl.net/dl1bke/
L: linux-hams at vger.kernel.org
S: Maintained
-+Z1211 WIRELESS DRIVER
++ZD1211RW-MAC80211 WIRELESS DRIVER
+P: Daniel Drake
+M: dsd at gentoo.org
+P: Ulrich Kunitz
@@ -19,20 +19,20 @@
P: Daniel Drake
M: dsd at gentoo.org
diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-09-26 20:00:32.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-09-27 09:59:55.000000000 -0400
@@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX) += bcm43xx/
obj-$(CONFIG_B43) += b43/
obj-$(CONFIG_B43LEGACY) += b43legacy/
obj-$(CONFIG_ZD1211RW) += zd1211rw/
-+obj-$(CONFIG_Z1211) += zd1211rw-mac80211/
++obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211/
# 16-bit wireless PCMCIA client drivers
obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c 2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,1620 @@
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c 2007-09-27 10:00:45.000000000 -0400
+@@ -0,0 +1,1619 @@
+/* zd_chip.c
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -412,7 +412,6 @@
+ [0] = { .addr = CR_MAC_ADDR_P1 },
+ [1] = { .addr = CR_MAC_ADDR_P2 },
+ };
-+ DECLARE_MAC_BUF(mac);
+
+ reqs[0].value = (mac_addr[3] << 24)
+ | (mac_addr[2] << 16)
@@ -422,7 +421,7 @@
+ | mac_addr[4];
+
+ dev_dbg_f(zd_chip_dev(chip),
-+ "mac addr %s\n", print_mac(mac, mac_addr));
++ "mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
+
+ mutex_lock(&chip->mutex);
+ r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
@@ -1654,8 +1653,8 @@
+ return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,10 @@
+obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o
+
@@ -1668,8 +1667,8 @@
+EXTRA_CFLAGS += -DDEBUG
+endif
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,57 @@
+/* zd_def.h
+ *
@@ -1729,8 +1728,8 @@
+
+#endif /* _ZD_DEF_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,108 @@
+/* zd_rf.h
+ *
@@ -1841,8 +1840,8 @@
+
+#endif /* _ZD_RF_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,921 @@
+/* zd_chip.h
+ *
@@ -2766,8 +2765,8 @@
+
+#endif /* _ZD_CHIP_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,439 @@
+/* zd_rf_al2230.c: Functions for the AL2230 RF controller
+ *
@@ -3209,8 +3208,8 @@
+ return 0;
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,29 @@
+/* zd_util.h
+ *
@@ -3242,8 +3241,8 @@
+
+#endif /* _ZD_UTIL_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,82 @@
+/* zd_util.c
+ *
@@ -3328,8 +3327,8 @@
+ return (u8 *)buffer + (buffer_size - tail_size);
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,279 @@
+/* zd_rf_rfmd.c: Functions for the RFMD RF controller
+ *
@@ -3611,8 +3610,8 @@
+ return 0;
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,75 @@
+#ifndef _ZD_IEEE80211_H
+#define _ZD_IEEE80211_H
@@ -3690,8 +3689,8 @@
+
+#endif /* _ZD_IEEE80211_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,18 @@
+config ZD1211RW_MAC80211
+ tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)"
@@ -3712,8 +3711,8 @@
+ ZD1211 debugging messages. Choosing Y will result in additional debug
+ messages being saved to your kernel logs, which may help debug any
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,100 @@
+/* zd_ieee80211.c
+ *
@@ -3816,8 +3815,8 @@
+}
+
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,263 @@
+/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
+ *
@@ -4083,8 +4082,8 @@
+
+#endif /* _ZD_USB_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,178 @@
+/* zd_rf.c
+ *
@@ -4265,8 +4264,8 @@
+}
+
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,534 @@
+/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
+ *
@@ -4803,8 +4802,8 @@
+}
+
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,227 @@
+/* zd_mac.h
+ *
@@ -5034,8 +5033,8 @@
+
+#endif /* _ZD_MAC_H */
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,492 @@
+/* zd_rf_al7230b.c: Functions for the AL7230B RF controller
+ *
@@ -5530,8 +5529,8 @@
+ return 0;
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c 2007-09-26 20:03:54.000000000 -0400
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c 2007-09-27 09:59:55.000000000 -0400
@@ -0,0 +1,1528 @@
+/* zd_usb.c
+ *
@@ -7062,9 +7061,9 @@
+ return r;
+}
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
---- /dev/null 2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c 2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,951 @@
+--- /dev/null 2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c 2007-09-27 10:01:28.000000000 -0400
+@@ -0,0 +1,950 @@
+/* zd_mac.c
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -7846,12 +7845,11 @@
+ } else {
+ struct dev_mc_list *mc = NULL;
+ void *tmp = NULL;
-+ DECLARE_MAC_BUF(macbuf);
+
+ zd_mc_clear(&hash);
+ while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
-+ dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
-+ print_mac(macbuf, mc->dmi_addr));
++ dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
++ MAC_ARG(mc->dmi_addr));
+ zd_mc_add_addr(&hash, mc->dmi_addr);
+ }
+ }
@@ -8017,13 +8015,13 @@
+ zd_chip_control_leds(&mac->chip, LED_OFF);
+}
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-09-26 20:04:18.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-09-27 09:59:55.000000000 -0400
@@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
source "drivers/net/wireless/rt2x00/Kconfig"
+ source "drivers/net/wireless/iwlwifi/Kconfig"
- endmenu
- Previous message: rpms/straw/devel Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec, 1.8, 1.9 dead.package, 1.1, NONE
- Next message: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4, 1.5 kernel-2.6.21-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec, 1.60, 1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list