rpms/kernel/F-7 linux-2.6-iwlwifi-fw-name-compat.patch, NONE, 1.1 git-wireless-dev.patch, 1.17, 1.18 kernel-2.6.spec, 1.3300, 1.3301 linux-2.6-wireless.patch, 1.6, 1.7 linux-2.6-bcm43xx-revert-breakage.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Jul 27 21:05:44 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18452
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
linux-2.6-wireless.patch
Added Files:
linux-2.6-iwlwifi-fw-name-compat.patch
Removed Files:
linux-2.6-bcm43xx-revert-breakage.patch
Log Message:
Update git-wireless-dev.patch (iwlwifi & bcm43xx updates)
linux-2.6-iwlwifi-fw-name-compat.patch:
--- NEW FILE linux-2.6-iwlwifi-fw-name-compat.patch ---
--- linux-2.6.22.noarch/drivers/net/wireless/iwl-base.c.orig 2007-07-27 16:01:31.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwl-base.c 2007-07-27 16:09:27.000000000 -0400
@@ -6200,8 +6200,10 @@ static int iwl_read_ucode(struct iwl_pri
#if IWL == 3945
/* firmware file name contains uCode/driver compatibility version */
const char *name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode";
+ const char *alt_name = "iwlwifi-3945.ucode";
#elif IWL == 4965
const char *name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode";
+ const char *alt_name = "iwlwifi-4965.ucode";
#endif
u8 *src;
size_t len;
@@ -6211,8 +6213,13 @@ static int iwl_read_ucode(struct iwl_pri
* request_firmware() is synchronous, file is in memory on return. */
rc = request_firmware(&ucode_raw, name, &priv->pci_dev->dev);
if (rc < 0) {
- IWL_ERROR("%s firmware file req failed: Reason %d\n", name, rc);
- goto error;
+ rc = request_firmware(&ucode_raw, alt_name,
+ &priv->pci_dev->dev);
+ if (rc < 0) {
+ IWL_ERROR("%s firmware file req failed: Reason %d\n",
+ name, rc);
+ goto error;
+ }
}
IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n",
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/git-wireless-dev.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- git-wireless-dev.patch 26 Jul 2007 03:14:45 -0000 1.17
+++ git-wireless-dev.patch 27 Jul 2007 21:05:10 -0000 1.18
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-07-25 22:51:44.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-07-25 22:51:49.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig 2007-07-27 16:48:35.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-07-27 16:49:13.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-25 22:51:44.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-25 22:51:49.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig 2007-07-27 16:48:35.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-27 16:49:13.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-25 22:51:44.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-25 22:51:49.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-07-27 16:48:35.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-27 16:49:13.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -627,9 +627,9 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,387 @@
+--- /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 16:49:13.000000000 -0400
+@@ -0,0 +1,385 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
+
@@ -644,7 +644,6 @@
+ *
+ * Licensed under the GPL version 2. See COPYING for details.
+ */
-+#ifdef __KERNEL__
+
+/** ChipCommon core registers. **/
+
@@ -1015,11 +1014,10 @@
+ struct ssb_serial_port *ports);
+#endif /* CONFIG_SSB_SERIAL */
+
-+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,163 @@
+--- /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 16:49:13.000000000 -0400
+@@ -0,0 +1,160 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
+ * for the BCM47xx family of SiliconBackplane-based chips.
@@ -1042,8 +1040,6 @@
+#ifndef LINUX_SSB_EXTIFCORE_H_
+#define LINUX_SSB_EXTIFCORE_H_
+
-+#ifdef __KERNEL__
-+
+struct ssb_extif {
+ struct ssb_device *dev;
+};
@@ -1181,16 +1177,13 @@
+#define SSB_EXTIF_WATCHDOG_CLK 48000000 /* Hz */
+
+
-+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,47 @@
+--- /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 16:49:13.000000000 -0400
+@@ -0,0 +1,44 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
+
-+#ifdef __KERNEL__
-+
+#ifdef CONFIG_SSB_DRIVER_MIPS
+
+struct ssb_device;
@@ -1231,14 +1224,12 @@
+
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
-+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,294 @@
+--- /dev/null 2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-27 16:49:13.000000000 -0400
+@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
-+#ifdef __KERNEL__
+
+
+/* SiliconBackplane Address Map.
@@ -1260,10 +1251,10 @@
+
+#define SSB_PCI_DMA 0x40000000 /* Client Mode sb2pcitranslation2 (1 GB) */
+#define SSB_PCI_DMA_SZ 0x40000000 /* Client Mode sb2pcitranslation2 size in bytes */
-+#define SSB_PCIE_DMA_L32 0x00000000 /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), low 32 bits */
-+#define SSB_PCIE_DMA_H32 0x80000000 /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */
-+#define SSB_EUART (SB_EXTIF_BASE + 0x00800000)
-+#define SSB_LED (SB_EXTIF_BASE + 0x00900000)
++#define SSB_PCIE_DMA_L32 0x00000000 /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), low 32 bits */
++#define SSB_PCIE_DMA_H32 0x80000000 /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */
++#define SSB_EUART (SSB_EXTIF_BASE + 0x00800000)
++#define SSB_LED (SSB_EXTIF_BASE + 0x00900000)
+
+
+/* Enumeration space constants */
@@ -1506,7 +1497,7 @@
+ SSB_SPROM1CCODE_NONE,
+};
+
-+/* Address-Match values and masks (SSB_ADMATCH?) */
++/* Address-Match values and masks (SSB_ADMATCHxxx) */
+#define SSB_ADM_TYPE 0x00000003 /* Address type */
+#define SSB_ADM_TYPE0 0
+#define SSB_ADM_TYPE1 1
@@ -1528,14 +1519,12 @@
+#define SSB_ADM_BASE2_SHIFT 16
+
+
-+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,108 @@
+--- /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 16:49:13.000000000 -0400
+@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_SSB_DRIVER_PCICORE
+
@@ -1639,22 +1628,18 @@
+}
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
-+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-25 22:51:49.000000000 -0400
-@@ -0,0 +1,422 @@
+--- /dev/null 2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-27 16:49:13.000000000 -0400
+@@ -0,0 +1,431 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
-+#ifdef __KERNEL__
+
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
-+#ifdef CONFIG_SSB_PCIHOST
-+# include <linux/pci.h>
-+#endif
++#include <linux/pci.h>
+
+#include <linux/ssb/ssb_regs.h>
+
@@ -1942,6 +1927,7 @@
+ struct pcmcia_device *host_pcmcia;
+
+#ifdef CONFIG_SSB_PCIHOST
++ /* Mutex to protect the SPROM writing. */
+ struct mutex pci_sprom_mutex;
+#endif
+
@@ -1958,7 +1944,7 @@
+ u8 suspend_cnt;
[...6063 lines suppressed...]
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-25 22:51:50.000000000 -0400
-@@ -0,0 +1,93 @@
+--- /dev/null 2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-27 16:49:14.000000000 -0400
+@@ -0,0 +1,92 @@
+menu "Sonics Silicon Backplane"
+
+config SSB
+ tristate "Sonics Silicon Backplane support"
-+ depends on EXPERIMENTAL
++ depends on EXPERIMENTAL && HAS_IOMEM
+ help
+ Support for the Sonics Silicon Backplane bus
+
@@ -90279,7 +90361,6 @@
+config SSB_DRIVER_PCICORE
+ bool "SSB PCI core driver"
+ depends on SSB && SSB_PCIHOST
-+ default y
+ help
+ Driver for the Sonics Silicon Backplane attached
+ Broadcom PCI core.
@@ -90312,9 +90393,9 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-25 22:51:50.000000000 -0400
-@@ -0,0 +1,407 @@
+--- /dev/null 2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-27 16:49:14.000000000 -0400
+@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
+ * Bus scanning
@@ -90332,14 +90413,12 @@
+#include <linux/ssb/ssb.h>
+#include <linux/ssb/ssb_regs.h>
+#include <linux/pci.h>
-+#include <asm/io.h>
++#include <linux/io.h>
+
-+#ifdef CONFIG_SSB_PCMCIAHOST
-+# include <pcmcia/cs_types.h>
-+# include <pcmcia/cs.h>
-+# include <pcmcia/cistpl.h>
-+# include <pcmcia/ds.h>
-+#endif
++#include <pcmcia/cs_types.h>
++#include <pcmcia/cs.h>
++#include <pcmcia/cistpl.h>
++#include <pcmcia/ds.h>
+
+#include "ssb_private.h"
+
@@ -90519,7 +90598,11 @@
+ iounmap(bus->mmio);
+ break;
+ case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
+ pci_iounmap(bus->host_pci, bus->mmio);
++#else
++ SSB_BUG_ON(1); /* Can't reach this code. */
++#endif
+ break;
+ }
+ bus->mmio = NULL;
@@ -90539,7 +90622,11 @@
+ mmio = ioremap(baseaddr, SSB_CORE_SIZE);
+ break;
+ case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
+ mmio = pci_iomap(bus->host_pci, 0, ~0UL);
++#else
++ SSB_BUG_ON(1); /* Can't reach this code. */
++#endif
+ break;
+ }
+
@@ -90722,9 +90809,9 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-25 22:51:50.000000000 -0400
-@@ -0,0 +1,562 @@
+--- /dev/null 2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-27 16:49:14.000000000 -0400
+@@ -0,0 +1,564 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom PCI-core driver
@@ -90761,8 +90848,10 @@
+#ifdef CONFIG_SSB_PCICORE_HOSTMODE
+
+#include <asm/paccess.h>
-+/* Read the bus and catch bus exceptions. This is MIPS specific. */
-+#define mips_busprobe(val, addr) get_dbe((val), (addr))
++/* Probe a 32bit value on the bus and catch bus exceptions.
++ * Returns nonzero on a bus exception.
++ * This is MIPS specific */
++#define mips_busprobe32(val, addr) get_dbe((val), ((u32 *)(addr)))
+
+/* Assume one-hot slot wiring */
+#define SSB_PCI_SLOT_MAX 16
@@ -90781,7 +90870,8 @@
+ int pos, size;
+ u32 *base;
+
-+ printk("PCI: Fixing up device %s\n", pci_name(d));
++ ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
++ pci_name(d));
+
+ /* Fix up resource bases */
+ for (pos = 0; pos < 6; pos++) {
@@ -90812,7 +90902,7 @@
+ if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
+ return;
+
-+ printk("PCI: fixing up bridge\n");
++ ssb_printk(KERN_INFO "PCI: fixing up bridge\n");
+
+ /* Enable PCI bridge bus mastering and memory space */
+ pci_set_master(dev);
@@ -90874,7 +90964,7 @@
+ u32 addr, val;
+ void __iomem *mmio;
+
-+ assert(pc->hostmode);
++ SSB_WARN_ON(!pc->hostmode);
+ if (unlikely(len != 1 && len != 2 && len != 4))
+ goto out;
+ addr = get_cfgspace_addr(pc, bus, dev, func, off);
@@ -90885,7 +90975,7 @@
+ if (!mmio)
+ goto out;
+
-+ if (mips_busprobe(val, (u32 *) mmio)) {
++ if (mips_busprobe32(val, mmio)) {
+ val = 0xffffffff;
+ goto unmap;
+ }
@@ -90920,7 +91010,7 @@
+ u32 addr, val = 0;
+ void __iomem *mmio;
+
-+ assert(pc->hostmode);
++ SSB_WARN_ON(!pc->hostmode);
+ if (unlikely(len != 1 && len != 2 && len != 4))
+ goto out;
+ addr = get_cfgspace_addr(pc, bus, dev, func, off);
@@ -90931,7 +91021,7 @@
+ if (!mmio)
+ goto out;
+
-+ if (mips_busprobe(val, (u32 *) mmio)) {
++ if (mips_busprobe32(val, mmio)) {
+ val = 0xffffffff;
+ goto unmap;
+ }
@@ -91018,10 +91108,8 @@
+{
+ u32 val;
+
-+ if (extpci_core) {
-+ WARN_ON(1);
++ if (WARN_ON(extpci_core))
+ return;
-+ }
+ extpci_core = pc;
+
+ ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
@@ -91091,7 +91179,7 @@
+ if (bus->chip_id == 0x5350)
+ return 0;
+
-+ return !mips_busprobe(tmp, (u32 *) (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++ return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
+}
+#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
+
@@ -91185,7 +91273,8 @@
+ struct ssb_device *dev;
+
+ dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
-+ assert(dev);
++ if (WARN_ON(!dev))
++ return;
+ /* This forces an update of the cached registers. */
+ ssb_broadcast_value(dev, 0xFD8, 0);
+}
@@ -91258,7 +91347,7 @@
+ pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
+ }
+ } else {
-+ assert(pdev->id.coreid == SSB_DEV_PCIE);
++ WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
+ //TODO: Better make defines for all these magic PCIE values.
+ if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
+ /* TLP Workaround register. */
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3300
retrieving revision 1.3301
diff -u -r1.3300 -r1.3301
--- kernel-2.6.spec 27 Jul 2007 16:55:26 -0000 1.3300
+++ kernel-2.6.spec 27 Jul 2007 21:05:11 -0000 1.3301
@@ -600,12 +600,12 @@
Patch668: linux-2.6-libata_pata_atiixp_add_ati_sb700.patch
Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
Patch671: linux-2.6-libata-pata_ali-fix-hp-detect.patch
-Patch680: git-wireless-dev.patch
-Patch682: linux-2.6-rtl8187.patch
-Patch683: linux-2.6-wireless.patch
-Patch690: linux-2.6-e1000-ich9.patch
-Patch710: linux-2.6-bcm43xx-pci-neuter.patch
-Patch711: linux-2.6-bcm43xx-revert-breakage.patch
+Patch680: linux-2.6-rtl8187.patch
+Patch681: linux-2.6-wireless.patch
+Patch682: linux-2.6-bcm43xx-pci-neuter.patch
+Patch690: git-wireless-dev.patch
+Patch700: linux-2.6-iwlwifi-fw-name-compat.patch
+Patch710: linux-2.6-e1000-ich9.patch
Patch712: linux-2.6-sky2-restore-workarounds.patch
Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
@@ -1314,12 +1314,13 @@
ApplyPatch linux-2.6-wireless.patch
# Add the new wireless stack and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
-# add patch from markmc so that e1000 supports ICH9
-ApplyPatch linux-2.6-e1000-ich9.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
-# commit 77548f58070894cf5970a110981e511ffe793369 broke transmission on some devices
-ApplyPatch linux-2.6-bcm43xx-revert-breakage.patch
+
+# add patch from markmc so that e1000 supports ICH9
+ApplyPatch linux-2.6-e1000-ich9.patch
# sky2: restore lost interrupt workarounds
# maintainer wanted this in 2.6.22
ApplyPatch linux-2.6-sky2-restore-workarounds.patch
@@ -2300,6 +2301,10 @@
%endif
%changelog
+* Fri Jul 27 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch (iwlwifi & bcm43xx updates)
+- Remove hunk of linux-2.6-wireless that was reverted upstream
+
* Fri Jul 27 2007 Chuck Ebbert <cebbert at redhat.com>
- revert upstream "genirq: do not mask interrupts by default"
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-wireless.patch 20 Jul 2007 21:21:41 -0000 1.6
+++ linux-2.6-wireless.patch 27 Jul 2007 21:05:11 -0000 1.7
@@ -4556,17 +4556,6 @@
wl3501_receive(this, skb->data, pkt_len);
skb_put(skb, pkt_len);
skb->protocol = eth_type_trans(skb, dev);
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig 2007-07-20 17:06:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2007-07-20 17:06:56.000000000 -0400
-@@ -1638,7 +1638,7 @@ void bcm43xx_phy_set_baseband_attenuatio
- return;
- }
-
-- if (phy->analog > 1) {
-+ if (phy->analog == 1) {
- value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
- value |= (baseband_attenuation << 2) & 0x003C;
- } else {
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2007-07-20 17:06:50.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c 2007-07-20 17:06:56.000000000 -0400
@@ -326,7 +326,6 @@ static int ap_control_proc_read(char *pa
--- linux-2.6-bcm43xx-revert-breakage.patch DELETED ---
More information about the scm-commits
mailing list