rpms/kernel/devel config-generic, 1.14, 1.15 git-wireless-dev.patch, 1.28, 1.29 kernel.spec, 1.58, 1.59
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Aug 8 20:34:28 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10180
Modified Files:
config-generic git-wireless-dev.patch kernel.spec
Log Message:
update wireless bits
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-generic 8 Aug 2007 20:20:13 -0000 1.14
+++ config-generic 8 Aug 2007 20:33:55 -0000 1.15
@@ -1238,9 +1238,11 @@
# CONFIG_IPW2200_DEBUG is not set
# CONFIG_LIBERTAS is not set
-# FIXME: Move to x86[64]-generic
CONFIG_IWLWIFI=y
CONFIG_IWLWIFI_DEBUG=y
+CONFIG_IWLWIFI_SENSITIVITY=y
+CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
+CONFIG_IWLWIFI_QOS=y
CONFIG_IWLWIFI_HT=y
CONFIG_IWL4965=m
CONFIG_IWL3945=m
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.28 -r 1.29 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- git-wireless-dev.patch 6 Aug 2007 23:58:58 -0000 1.28
+++ git-wireless-dev.patch 8 Aug 2007 20:33:55 -0000 1.29
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-08-06 19:40:36.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig 2007-08-08 16:02:52.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-08-08 16:07:19.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -67,7 +67,7 @@
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
--- linux-2.6.22.noarch/include/linux/nl80211.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-08-06 19:42:06.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-08-08 16:07:19.000000000 -0400
@@ -7,6 +7,201 @@
*/
@@ -327,8 +327,8 @@
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+
#endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-08-06 19:40:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-08-08 16:02:56.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-08-08 16:07:19.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -627,8 +627,8 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,390 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1020,8 +1020,8 @@
+#endif /* CONFIG_SSB_SERIAL */
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,198 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1221,8 +1221,8 @@
+
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1270,8 +1270,8 @@
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1565,8 +1565,8 @@
+
+
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1674,8 +1674,8 @@
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,432 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2109,8 +2109,8 @@
+
+
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-08-06 19:40:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-08-08 16:02:57.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-08-08 16:07:19.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2253,8 +2253,8 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-06 19:40:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-08 16:02:57.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-08 16:07:19.000000000 -0400
@@ -300,7 +300,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
@@ -2426,7 +2426,7 @@
int rate);
--- linux-2.6.22.noarch/include/net/iw_handler.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-08-06 19:42:06.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-08-08 16:07:19.000000000 -0400
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -2442,8 +2442,8 @@
/* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig 2007-08-06 19:40:36.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig 2007-08-08 16:02:53.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS 2007-08-08 16:07:19.000000000 -0400
@@ -277,6 +277,14 @@ M: corentin.labbe at geomatys.fr
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -2548,8 +2548,8 @@
SONY VAIO CONTROL DEVICE DRIVER
P: Mattia Dongili
M: malattia at linux.it
---- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-08-06 19:40:43.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-08-08 16:02:58.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-08-08 16:07:19.000000000 -0400
@@ -184,14 +184,31 @@ void ieee80211_if_set_type(struct net_de
(unsigned long) sdata);
skb_queue_head_init(&ifsta->skb_queue);
@@ -2592,8 +2592,8 @@
} else {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: Someone had deleted my STA "
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-08-06 19:40:43.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-06 19:42:06.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-08-08 16:03:16.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-08 16:07:19.000000000 -0400
@@ -27,12 +27,411 @@
#include "aes_ccm.h"
#include "debugfs_key.h"
@@ -3889,7 +3889,7 @@
default:
return -EINVAL;
}
-@@ -1035,6 +2169,31 @@ static int ieee80211_ioctl_prism2_param(
+@@ -1042,6 +2176,31 @@ static int ieee80211_ioctl_prism2_param(
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
switch (param) {
@@ -3921,7 +3921,7 @@
case PRISM2_PARAM_IEEE_802_1X:
if (local->ops->set_ieee8021x)
ret = local->ops->set_ieee8021x(local_to_hw(local),
-@@ -1047,14 +2206,21 @@ static int ieee80211_ioctl_prism2_param(
+@@ -1054,14 +2213,21 @@ static int ieee80211_ioctl_prism2_param(
break;
case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
@@ -3947,7 +3947,7 @@
break;
case PRISM2_PARAM_STAT_TIME:
-@@ -1075,6 +2241,12 @@ static int ieee80211_ioctl_prism2_param(
+@@ -1082,6 +2248,12 @@ static int ieee80211_ioctl_prism2_param(
ret = -EINVAL;
break;
@@ -3960,7 +3960,7 @@
case PRISM2_PARAM_NEXT_MODE:
local->next_mode = value;
break;
-@@ -1089,6 +2261,15 @@ static int ieee80211_ioctl_prism2_param(
+@@ -1096,6 +2268,15 @@ static int ieee80211_ioctl_prism2_param(
ret = -EINVAL;
[...6325 lines suppressed...]
-+
-+ for (; j < 8; j++)
-+ out += snprintf(buf + out, count - out, " ");
-+ }
-+
-+ return out;
-+}
-+
-+#ifdef CONFIG_IWLWIFI_DEBUG
-+static inline void printk_buf(int level, const void *p, u32 len)
-+{
-+ const u8 *data = p;
-+ char line[81];
-+ u32 ofs = 0;
-+ if (!(iwl_debug_level & level))
-+ return;
-+
-+ while (len) {
-+ snprint_line(line, sizeof(line), &data[ofs],
-+ min(len, 16U), ofs);
-+ printk(KERN_DEBUG "%s\n", line);
-+ ofs += 16;
-+ len -= min(len, 16U);
-+ }
-+}
-+#else
-+#define printk_buf(level, p, len) do {} while (0)
-+#endif
-+
+#endif /* __iwl_helpers_h__ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rt73usb.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rt73usb.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,1961 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -88811,8 +88774,8 @@
+
+module_init(rt73usb_init);
+module_exit(rt73usb_exit);
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/iwl-3945-rs.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/iwl-3945-rs.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,985 @@
+/******************************************************************************
+ *
@@ -89561,9 +89524,9 @@
+ IWL_DEBUG_RATE("decrease rate because of low success_ratio\n");
+ scale_action = -1;
+ } else if ((low_tpt == IWL_INVALID_VALUE) &&
-+ (high_tpt == IWL_INVALID_VALUE)) {
++ (high_tpt == IWL_INVALID_VALUE))
+ scale_action = 1;
-+ } else if ((low_tpt != IWL_INVALID_VALUE) &&
++ else if ((low_tpt != IWL_INVALID_VALUE) &&
+ (high_tpt != IWL_INVALID_VALUE)
+ && (low_tpt < current_tpt)
+ && (high_tpt < current_tpt)) {
@@ -89799,9 +89762,9 @@
+}
+
+
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-08-06 19:42:06.000000000 -0400
-@@ -0,0 +1,13 @@
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-08-08 16:07:19.000000000 -0400
+@@ -0,0 +1,14 @@
+# core
+ssb-y += main.o scan.o
+
@@ -89811,12 +89774,13 @@
+
+# built-in drivers
+ssb-y += driver_chipcommon.o
-+ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o driver_extif.o
++ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
++ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
+ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o
+
+obj-$(CONFIG_SSB) += ssb.o
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,265 @@
+/*
+ * Sonics Silicon Backplane
@@ -90083,8 +90047,8 @@
+error:
+ return -ENODEV;
+}
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,1113 @@
+/*
+ * Sonics Silicon Backplane
@@ -91199,8 +91163,8 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -91306,8 +91270,8 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,223 @@
+/*
+ * Sonics Silicon Backplane
@@ -91532,8 +91496,8 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,122 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -91657,8 +91621,8 @@
+extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,704 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -92364,8 +92328,8 @@
+out:
+ return err;
+}
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,425 @@
+/*
+ * Sonics Silicon Backplane
@@ -92792,8 +92756,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,92 @@
+menu "Sonics Silicon Backplane"
+
@@ -92887,8 +92851,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -93303,8 +93267,8 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -93410,8 +93374,8 @@
+ *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
+}
+
---- /dev/null 2007-08-06 19:21:45.791015256 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-06 19:42:06.000000000 -0400
+--- /dev/null 2007-08-08 08:21:33.519325700 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-08 16:07:19.000000000 -0400
@@ -0,0 +1,568 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kernel.spec 8 Aug 2007 20:20:13 -0000 1.58
+++ kernel.spec 8 Aug 2007 20:33:55 -0000 1.59
@@ -579,14 +579,14 @@
Patch630: linux-2.6-defaults-nonmi.patch
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch670: linux-2.6-ata-quirk.patch
-Patch680: git-wireless-dev.patch
-Patch681: linux-2.6-mac80211-local-mcast-filter.patch
-Patch682: linux-2.6-mac80211-probe-hidden-essid.patch
-Patch690: linux-2.6-net-e1000e.patch
+Patch680: linux-2.6-wireless.patch
+Patch681: linux-2.6-wireless-pending.patch
+Patch690: git-wireless-dev.patch
+Patch691: linux-2.6-mac80211-local-mcast-filter.patch
+Patch692: linux-2.6-mac80211-probe-hidden-essid.patch
+Patch693: linux-2.6-iwlwifi-fw-name-compat.patch
Patch700: linux-2.6-bcm43xx-pci-neuter.patch
-Patch701: linux-2.6-bcm43xx-revert-breakage.patch
-Patch702: linux-2.6-softmac-deadlock.patch
-Patch710: linux-2.6-iwlwifi-fw-name-compat.patch
+Patch710: linux-2.6-net-e1000e.patch
#Patch780: linux-2.6-clockevents-fix-resume-logic.patch
Patch780: linux-2.6-highres-timers.patch
Patch800: linux-2.6-wakeups-hdaps.patch
@@ -1203,23 +1203,25 @@
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
+# wireless patches not yet in Linus' tree
+ApplyPatch linux-2.6-wireless.patch
+# wireless patches staged for 2.6.24
+ApplyPatch linux-2.6-wireless-pending.patch
# Add the wireless stack updates and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
# mac80211: Filter locally-originated multicast frames echoed by AP
ApplyPatch linux-2.6-mac80211-local-mcast-filter.patch
# mac80211: probe for hidden SSIDs when SSID not found
ApplyPatch linux-2.6-mac80211-probe-hidden-essid.patch
-# latest Intel driver for ich9
-ApplyPatch linux-2.6-net-e1000e.patch
-# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
-ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
-# commit 77548f58070894cf5970a110981e511ffe793369 broke tx on some devices
-ApplyPatch linux-2.6-bcm43xx-revert-breakage.patch
-# Fix deadlock in ieee80211 softmac
-ApplyPatch linux-2.6-softmac-deadlock.patch
# temp compat patch for iwlwifi firmware filenames
ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
+# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
+ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
+
+# latest Intel driver for ich9
+ApplyPatch linux-2.6-net-e1000e.patch
+
# ACPI patches
# Fix excessive wakeups
@@ -2145,6 +2147,9 @@
%endif
%changelog
+* Wed Aug 08 2007 John W. Linville <linville at redhat.com>
+- Update wireless bits from wireless-2.6 and wireless-dev
+
* Wed Aug 08 2007 Chuck Ebbert <cebbert at redhat.com>
- new e1000e (ICH9) driver from the netdev tree
@@ -2154,7 +2159,7 @@
* Mon Aug 06 2007 John W. Linville <linville at redhat.com>
- Update git-wireless-dev.patch (bcm43xx-mac80211 & zd1211rw-mac80211 updates)
- mac80211: Filter locally-originated multicast frames echoed by AP (2nd try)
-- mac80211: probe for hidden SSIDs during when scanning for association
+- mac80211: probe for hidden SSIDs when scanning for association
* Mon Aug 06 2007 Dave Jones <davej at redhat.com>
- Make CONFIG_DEBUG_STACK_USAGE a 'make debug' option.
More information about the fedora-extras-commits
mailing list