rpms/kernel/devel config-generic, 1.10, 1.11 git-wireless-dev.patch, 1.25, 1.26 kernel.spec, 1.43, 1.44
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue Jul 31 20:32:52 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13663
Modified Files:
config-generic git-wireless-dev.patch kernel.spec
Log Message:
iwlwifi, rt2x00, & zd1211rw updates
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-generic 31 Jul 2007 18:25:55 -0000 1.10
+++ config-generic 31 Jul 2007 20:32:18 -0000 1.11
@@ -1241,6 +1241,7 @@
# FIXME: Move to x86[64]-generic
CONFIG_IWLWIFI=y
CONFIG_IWLWIFI_DEBUG=y
+CONFIG_IWLWIFI_HT=y
CONFIG_IWL4965=m
CONFIG_IWL3945=m
# CONFIG_NL80211 is not set
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.25 -r 1.26 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- git-wireless-dev.patch 27 Jul 2007 20:21:01 -0000 1.25
+++ git-wireless-dev.patch 31 Jul 2007 20:32:18 -0000 1.26
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig 2007-07-31 16:06:19.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-07-31 16:07:37.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -66,8 +66,8 @@
N: Lars Wirzenius
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-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-27 15:47:17.000000000 -0400
+--- 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-07-31 16:07:37.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-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-07-31 16:06:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-31 16:07:37.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -627,9 +627,9 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-27 15:47:17.000000000 -0400
-@@ -0,0 +1,385 @@
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-31 16:07:37.000000000 -0400
+@@ -0,0 +1,388 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
+
@@ -1009,14 +1009,17 @@
+extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
+ enum ssb_clkmode mode);
+
++extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
++ u32 ticks);
++
+#ifdef CONFIG_SSB_SERIAL
+extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
+ struct ssb_serial_port *ports);
+#endif /* CONFIG_SSB_SERIAL */
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,160 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1178,8 +1181,8 @@
+
+
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,44 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1225,8 +1228,8 @@
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1520,8 +1523,8 @@
+
+
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1629,9 +1632,9 @@
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-27 15:47:17.000000000 -0400
-@@ -0,0 +1,431 @@
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-31 16:07:37.000000000 -0400
+@@ -0,0 +1,432 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
+
@@ -1829,7 +1832,8 @@
+static inline
+struct ssb_device * dev_to_ssb_dev(struct device *dev)
+{
-+ struct __ssb_dev_wrapper *wrap = container_of(dev, struct __ssb_dev_wrapper, dev);
++ struct __ssb_dev_wrapper *wrap;
++ wrap = container_of(dev, struct __ssb_dev_wrapper, dev);
+ return wrap->sdev;
+}
+
@@ -2063,8 +2067,8 @@
+
+
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-31 16:06:18.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-31 16:07:37.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2207,8 +2211,8 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-31 16:06:18.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-31 16:07:37.000000000 -0400
@@ -300,7 +300,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
@@ -2379,8 +2383,8 @@
size_t frame_len,
int rate);
---- linux-2.6.22.noarch/include/net/iw_handler.h.orig 2007-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-07-27 15:47:17.000000000 -0400
+--- 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-07-31 16:07:37.000000000 -0400
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -2396,8 +2400,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-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig 2007-07-31 16:06:19.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS 2007-07-31 16:07:37.000000000 -0400
@@ -277,6 +277,14 @@ M: corentin.labbe at geomatys.fr
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -2502,8 +2506,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-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-07-31 16:06:18.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-31 16:07:37.000000000 -0400
@@ -184,14 +184,31 @@ void ieee80211_if_set_type(struct net_de
(unsigned long) sdata);
skb_queue_head_init(&ifsta->skb_queue);
@@ -2546,8 +2550,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-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-07-31 16:06:18.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-31 16:07:37.000000000 -0400
@@ -27,12 +27,411 @@
#include "aes_ccm.h"
#include "debugfs_key.h"
@@ -4176,8 +4180,8 @@
/* Structures to export the Wireless Handlers */
static const iw_handler ieee80211_handler[] =
---- linux-2.6.22.noarch/net/mac80211/debugfs_sta.c.orig 2007-07-27 15:44:55.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_sta.c 2007-07-27 15:47:17.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/debugfs_sta.c.orig 2007-07-08 19:32:17.000000000 -0400
[...15878 lines suppressed...]
+
+
+/* scan.c */
-+extern const char * ssb_core_name(u16 coreid);
++extern const char *ssb_core_name(u16 coreid);
+extern int ssb_bus_scan(struct ssb_bus *bus,
+ unsigned long baseaddr);
+extern void ssb_iounmap(struct ssb_bus *ssb);
@@ -90658,12 +91500,12 @@
+extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
+extern int ssb_devices_freeze(struct ssb_bus *bus);
+extern int ssb_devices_thaw(struct ssb_bus *bus);
-+extern struct ssb_bus * ssb_pci_dev_to_bus(struct pci_dev *pdev);
++extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-27 15:47:17.000000000 -0400
-@@ -0,0 +1,692 @@
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-31 16:07:37.000000000 -0400
+@@ -0,0 +1,704 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
+ *
@@ -91203,6 +92045,7 @@
+ writel(value, bus->mmio + offset);
+}
+
++/* Not "static", as it's used in main.c */
+const struct ssb_bus_ops ssb_pci_ops = {
+ .read16 = ssb_pci_read16,
+ .read32 = ssb_pci_read32,
@@ -91260,6 +92103,9 @@
+ if (!sprom)
+ goto out;
+
++ /* Use interruptible locking, as the SPROM write might
++ * be holding the lock for several seconds. So allow userspace
++ * to cancel operation. */
+ err = -ERESTARTSYS;
+ if (mutex_lock_interruptible(&bus->pci_sprom_mutex))
+ goto out_kfree;
@@ -91302,10 +92148,18 @@
+ goto out_kfree;
+ }
+
++ /* Use interruptible locking, as the SPROM write might
++ * be holding the lock for several seconds. So allow userspace
++ * to cancel operation. */
+ err = -ERESTARTSYS;
+ if (mutex_lock_interruptible(&bus->pci_sprom_mutex))
+ goto out_kfree;
+ err = ssb_devices_freeze(bus);
++ if (err == -EOPNOTSUPP) {
++ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
++ "No suspend support. Is CONFIG_PM enabled?\n");
++ goto out_unlock;
++ }
+ if (err) {
+ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
+ goto out_unlock;
@@ -91356,9 +92210,9 @@
+out:
+ return err;
+}
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-27 15:47:17.000000000 -0400
-@@ -0,0 +1,394 @@
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-31 16:07:37.000000000 -0400
+@@ -0,0 +1,401 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom ChipCommon core driver
@@ -91673,6 +92527,13 @@
+ }
+}
+
++/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
++void
++ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
++{
++ /* instant NMI */
++ chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
++}
+
+#ifdef CONFIG_SSB_SERIAL
+int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
@@ -91753,8 +92614,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,92 @@
+menu "Sonics Silicon Backplane"
+
@@ -91848,8 +92709,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-27 15:47:17.000000000 -0400
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-31 16:07:37.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -91878,7 +92739,7 @@
+#include "ssb_private.h"
+
+
-+const char * ssb_core_name(u16 coreid)
++const char *ssb_core_name(u16 coreid)
+{
+ switch (coreid) {
+ case SSB_DEV_CHIPCOMMON:
@@ -92064,8 +92925,8 @@
+ bus->mapped_device = NULL;
+}
+
-+static void __iomem * ssb_ioremap(struct ssb_bus *bus,
-+ unsigned long baseaddr)
++static void __iomem *ssb_ioremap(struct ssb_bus *bus,
++ unsigned long baseaddr)
+{
+ void __iomem *mmio = NULL;
+
@@ -92264,9 +93125,9 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-07-27 08:43:03.361455709 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-27 15:47:17.000000000 -0400
-@@ -0,0 +1,564 @@
+--- /dev/null 2007-07-31 11:54:02.779868626 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-31 16:07:37.000000000 -0400
+@@ -0,0 +1,568 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom PCI-core driver
@@ -92316,8 +93177,8 @@
+/* Core to access the external PCI config space. Can only have one. */
+static struct ssb_pcicore *extpci_core;
+
-+u32 pci_iobase = 0x100;
-+u32 pci_membase = SSB_PCI_DMA;
++static u32 ssb_pcicore_pcibus_iobase = 0x100;
++static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
+
+int pcibios_plat_dev_init(struct pci_dev *d)
+{
@@ -92331,7 +93192,10 @@
+ /* Fix up resource bases */
+ for (pos = 0; pos < 6; pos++) {
+ res = &d->resource[pos];
-+ base = ((res->flags & IORESOURCE_IO) ? &pci_iobase : &pci_membase);
++ if (res->flags & IORESOURCE_IO)
++ base = &ssb_pcicore_pcibus_iobase;
++ else
++ base = &ssb_pcicore_pcibus_membase;
+ if (res->end) {
+ size = res->end - res->start + 1;
+ if (*base & (size - 1))
@@ -92541,7 +93405,7 @@
+static struct resource ssb_pcicore_mem_resource = {
+ .name = "SSB PCIcore external memory",
+ .start = SSB_PCI_DMA,
-+ .end = (u32)SSB_PCI_DMA + (u32)SSB_PCI_DMA_SZ - 1,
++ .end = SSB_PCI_DMA + SSB_PCI_DMA_SZ - 1,
+ .flags = IORESOURCE_MEM,
+};
+
@@ -92574,12 +93438,12 @@
+ pcicore_write32(pc, SSB_PCICORE_CTL, val);
+ val |= SSB_PCICORE_CTL_CLK; /* Clock on */
+ pcicore_write32(pc, SSB_PCICORE_CTL, val);
-+ udelay(150);
++ udelay(150); /* Assertion time demanded by the PCI standard */
+ val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
+ pcicore_write32(pc, SSB_PCICORE_CTL, val);
-+ udelay(1);
++ udelay(1); /* Assertion time demanded by the PCI standard */
+
-+ //TODO cardbus mode
++ /*TODO cardbus mode */
+
+ /* 64MB I/O window */
+ pcicore_write32(pc, SSB_PCICORE_SBTOPCI0,
@@ -92700,6 +93564,7 @@
+ v |= (u32)address << 18;
+ v |= data;
+ pcicore_write32(pc, mdio_data, v);
++ /* Wait for the device to complete the transaction */
+ udelay(10);
+ for (i = 0; i < 10; i++) {
+ v = pcicore_read32(pc, mdio_control);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kernel.spec 31 Jul 2007 20:23:18 -0000 1.43
+++ kernel.spec 31 Jul 2007 20:32:19 -0000 1.44
@@ -2162,6 +2162,9 @@
%endif
%changelog
+* Tue Jul 31 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch (iwlwifi, rt2x00, & zd1211rw updates)
+
* Tue Jul 31 2007 Chuck Ebbert <cebbert at redhat.com>
- fix boot from CD and remove debug patch
More information about the fedora-extras-commits
mailing list