rpms/kernel/devel git-wireless-dev.patch, 1.19, 1.20 kernel.spec, 1.17, 1.18 linux-2.6-mac80211-rtnl-deadlock.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jul 19 20:42:40 UTC 2007
- Previous message: devel/kvm kvm.spec,1.17,1.18 qemu-0.9.0-load-initrd.patch,1.1,NONE
- Next message: rpms/squid/devel squid-2.6.STABLE14-config.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 sources, 1.28, 1.29 squid.init, 1.7, 1.8 squid.spec, 1.84, 1.85 squid-2.5.STABLE11-config.patch, 1.1, NONE
- 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-serv27048
Modified Files:
git-wireless-dev.patch kernel.spec
Removed Files:
linux-2.6-mac80211-rtnl-deadlock.patch
Log Message:
another wireless update
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.19 -r 1.20 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- git-wireless-dev.patch 16 Jul 2007 20:32:21 -0000 1.19
+++ git-wireless-dev.patch 19 Jul 2007 20:42:36 -0000 1.20
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-07-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-07-19 16:30:16.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-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-16 16:08:20.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-19 16:30:17.000000000 -0400
@@ -7,6 +7,217 @@
*/
@@ -343,8 +343,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-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-07-19 16:27:54.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-19 16:30:17.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -643,8 +643,8 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,387 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1033,8 +1033,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,163 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1199,8 +1199,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,47 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1249,8 +1249,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,294 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1546,8 +1546,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,108 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1657,8 +1657,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,422 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2082,8 +2082,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-19 16:27:55.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-19 16:30:17.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2226,8 +2226,8 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-19 16:27:56.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-19 16:30:17.000000000 -0400
@@ -300,7 +300,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
@@ -2294,8 +2294,8 @@
/* Setup beacon data for IBSS beacons. Unlike access point (Master),
* IBSS uses a fixed beacon frame which is configured using this
* function. This handler is required only for IBSS mode. */
---- linux-2.6.22.noarch/include/net/iw_handler.h.orig 2007-07-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-07-16 16:08:20.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-19 16:30:17.000000000 -0400
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -2311,8 +2311,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-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig 2007-07-19 16:27:47.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS 2007-07-19 16:30:16.000000000 -0400
@@ -299,6 +299,14 @@ M: corentin.labbe at geomatys.fr
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -2417,8 +2417,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-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-07-19 16:27:57.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-19 16:30:17.000000000 -0400
@@ -184,14 +184,31 @@ void ieee80211_if_set_type(struct net_de
(unsigned long) sdata);
skb_queue_head_init(&ifsta->skb_queue);
@@ -2451,30 +2451,15 @@
msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
sdata->bss = &msdata->u.ap;
break;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-07-16 16:08:06.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-16 16:08:20.000000000 -0400
-@@ -27,26 +27,412 @@
- #include "aes_ccm.h"
- #include "debugfs_key.h"
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-07-19 16:27:57.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-19 16:30:17.000000000 -0400
+@@ -41,12 +41,411 @@ static int ieee80211_japan_5ghz /* = 0 *
+ module_param(ieee80211_japan_5ghz, int, 0444);
+ MODULE_PARM_DESC(ieee80211_japan_5ghz, "Vendor-updated firmware for 5 GHz");
--static int ieee80211_regdom = 0x10; /* FCC */
--module_param(ieee80211_regdom, int, 0444);
--MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain; 64=MKK");
--
--/*
-- * If firmware is upgraded by the vendor, additional channels can be used based
-- * on the new Japanese regulatory rules. This is indicated by setting
-- * ieee80211_japan_5ghz module parameter to one when loading the 80211 kernel
-- * module.
-- */
--static int ieee80211_japan_5ghz /* = 0 */;
--module_param(ieee80211_japan_5ghz, int, 0444);
--MODULE_PARM_DESC(ieee80211_japan_5ghz, "Vendor-updated firmware for 5 GHz");
--
-static void ieee80211_set_hw_encryption(struct net_device *dev,
- struct sta_info *sta, u8 addr[ETH_ALEN],
- struct ieee80211_key *key)
-+
+static int ieee80211_ioctl_set_beacon(struct net_device *dev,
+ struct prism2_hostapd_param *param,
+ int param_len,
@@ -2883,7 +2868,7 @@
/* default to sw encryption; this will be cleared by low-level
* driver if the hw supports requested encryption */
-@@ -57,6 +443,7 @@ static void ieee80211_set_hw_encryption(
[...3504 lines suppressed...]
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,407 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84402,8 +84079,8 @@
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("rt2x00 library");
+MODULE_LICENSE("GPL");
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,112 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84517,8 +84194,8 @@
+#endif /* CONFIG_PM */
+
+#endif /* RT2X00PCI_H */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,1903 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -86423,13 +86100,13 @@
+
+module_init(rt73usb_init);
+module_exit(rt73usb_exit);
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README 2007-07-19 16:30:16.000000000 -0400
@@ -0,0 +1,2 @@
+This directory contains IEEE 802.11 wireless LAN drivers that are using
+Devicescape IEEE 802.11 stack (net/mac80211).
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-07-16 16:08:07.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-07-19 16:27:51.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-07-19 16:30:16.000000000 -0400
@@ -562,4 +562,6 @@ source "drivers/net/wireless/hostap/Kcon
source "drivers/net/wireless/bcm43xx/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
@@ -86437,8 +86114,8 @@
+source "drivers/net/wireless/mac80211/Kconfig"
+
endmenu
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-07-16 16:08:07.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-07-16 16:08:20.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-07-19 16:30:16.000000000 -0400
@@ -1,6 +1,7 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
@@ -86447,8 +86124,8 @@
select WIRELESS_EXT
select FW_LOADER
select HW_RANDOM
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,11 @@
+ssb-builtin-drivers-y += driver_chipcommon.o
+ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
@@ -86461,8 +86138,8 @@
+
+ssb-objs := main.o scan.o \
+ $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,263 @@
+/*
+ * Sonics Silicon Backplane
@@ -86727,8 +86404,8 @@
+error:
+ return -ENODEV;
+}
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,1061 @@
+/*
+ * Sonics Silicon Backplane
@@ -87791,8 +87468,8 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -87898,8 +87575,8 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,258 @@
+/*
+ * Sonics Silicon Backplane
@@ -88159,8 +87836,8 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,137 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -88299,8 +87976,8 @@
+#endif /* CONFIG_SSB_PCIHOST */
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,688 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -88990,8 +88667,8 @@
+out:
+ return err;
+}
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,402 @@
+/*
+ * Sonics Silicon Backplane
@@ -89395,8 +89072,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,93 @@
+menu "Sonics Silicon Backplane"
+
@@ -89491,8 +89168,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-16 16:08:20.000000000 -0400
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-19 16:30:17.000000000 -0400
@@ -0,0 +1,407 @@
+/*
+ * Sonics Silicon Backplane
@@ -89901,9 +89578,9 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-07-16 08:00:11.354832693 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-16 16:08:20.000000000 -0400
-@@ -0,0 +1,556 @@
+--- /dev/null 2007-07-19 08:33:28.353042235 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-19 16:30:17.000000000 -0400
+@@ -0,0 +1,562 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom PCI-core driver
@@ -90402,9 +90079,15 @@
+ u32 intvec;
+
+ intvec = ssb_read32(pdev, SSB_INTVEC);
-+ tmp = ssb_read32(dev, SSB_TPSFLAG);
-+ tmp &= SSB_TPSFLAG_BPFLAG;
-+ intvec |= tmp;
++ if ((bus->chip_id & 0xFF00) == 0x4400) {
++ /* Workaround: On the BCM44XX the BPFLAG routing
++ * bit is wrong. Use a hardcoded constant. */
++ intvec |= 0x00000002;
++ } else {
++ tmp = ssb_read32(dev, SSB_TPSFLAG);
++ tmp &= SSB_TPSFLAG_BPFLAG;
++ intvec |= tmp;
++ }
+ ssb_write32(pdev, SSB_INTVEC, intvec);
+ }
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kernel.spec 19 Jul 2007 18:17:09 -0000 1.17
+++ kernel.spec 19 Jul 2007 20:42:37 -0000 1.18
@@ -583,7 +583,6 @@
Patch671: linux-2.6-libata-sb700-sata-ids.patch
Patch680: git-wireless-dev.patch
Patch681: git-iwlwifi.patch
-Patch682: linux-2.6-mac80211-rtnl-deadlock.patch
Patch690: linux-2.6-e1000-ich9.patch
Patch710: linux-2.6-bcm43xx-pci-neuter.patch
#Patch780: linux-2.6-clockevents-fix-resume-logic.patch
@@ -1208,8 +1207,6 @@
ApplyPatch git-wireless-dev.patch
# Add iwlwifi from intellinuxwireless.org
ApplyPatch git-iwlwifi.patch
-# Remove excessive(?) rtnl locking in ieee80211_sta_config_auth
-ApplyPatch linux-2.6-mac80211-rtnl-deadlock.patch
# add patch from markmc so that e1000 supports ICH9
ApplyPatch linux-2.6-e1000-ich9.patch
# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
@@ -2154,6 +2151,9 @@
%endif
%changelog
+* Thu Jul 19 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch
+
* Wed Jul 18 2007 John W. Linville <linville at redhat.com>
- mac80211: avoid deadlock during device shutdown
--- linux-2.6-mac80211-rtnl-deadlock.patch DELETED ---
- Previous message: devel/kvm kvm.spec,1.17,1.18 qemu-0.9.0-load-initrd.patch,1.1,NONE
- Next message: rpms/squid/devel squid-2.6.STABLE14-config.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 sources, 1.28, 1.29 squid.init, 1.7, 1.8 squid.spec, 1.84, 1.85 squid-2.5.STABLE11-config.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list