rpms/kernel/devel linux-2.6-bcm43xx-device-table.patch, NONE, 1.1 .cvsignore, 1.312, 1.313 kernel-2.6.spec, 1.1813, 1.1814 sources, 1.254, 1.255 linux-2.6-bcm43xx-txfix.patch, 1.1, NONE linux-2.6-bcm43xx-version.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 3 10:57:15 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv823

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Added Files:
	linux-2.6-bcm43xx-device-table.patch 
Removed Files:
	linux-2.6-bcm43xx-txfix.patch linux-2.6-bcm43xx-version.patch 
Log Message:
Update Broadcom wireless driver

linux-2.6-bcm43xx-device-table.patch:
 bcm43xx_main.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-bcm43xx-device-table.patch ---
--- linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c~	2006-01-03 04:35:26.000000000 +0000
+++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-01-03 04:35:29.000000000 +0000
@@ -139,6 +139,7 @@ static struct pci_device_id bcm43xx_pci_
 	/* required last entry */
 	{ 0, },
 };
+MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl);
 
 static void bcm43xx_recover_from_fatal(struct bcm43xx_private *bcm, const char *error);
 static void bcm43xx_free_board(struct bcm43xx_private *bcm);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- .cvsignore	3 Jan 2006 05:47:14 -0000	1.312
+++ .cvsignore	3 Jan 2006 10:57:13 -0000	1.313
@@ -2,5 +2,5 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-ieee80211softmac-20060102.tar.bz2
-bcm43xx-20060102.tar.bz2
+bcm43xx-20060103.tar.bz2
+ieee80211softmac-20060103.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -r1.1813 -r1.1814
--- kernel-2.6.spec	3 Jan 2006 05:50:00 -0000	1.1813
+++ kernel-2.6.spec	3 Jan 2006 10:57:13 -0000	1.1814
@@ -182,7 +182,7 @@
 Source10: COPYING.modules
 Source11: genkey
 
-%define BCMVER 20060102
+%define BCMVER 20060103
 Source12: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/softmac/ieee80211softmac-%{BCMVER}.tar.bz2
 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2
 
@@ -379,10 +379,9 @@
 
 # Broadcom wireless driver
 Patch5000: linux-2.6-bcm43xx.patch
-Patch5001: linux-2.6-bcm43xx-version.patch
 Patch5002: linux-2.6-bcm43xx-promisc.patch
-Patch5003: linux-2.6-bcm43xx-txfix.patch
-Patch5004: linux-2.6.14-ieee80211-hw-wep.patch
+Patch5003: linux-2.6.14-ieee80211-hw-wep.patch
+Patch5004: linux-2.6-bcm43xx-device-table.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -894,16 +893,13 @@
 
 # Patch Kconfig and Makefiles to merge it 'properly'
 %patch5000 -p1
-# Make it accept kernel version 2.6.14, since we're actually 2.6.15-rc
-%patch5001 -p1
-# Fix tx status with core rev < 5 (will be fixed in 20060603 snapshot)
-%patch5002 -p1
 # Operate in promiscuous mode, to make multicast and broadcast RX work
-%patch5003 -p1
+%patch5002 -p1
 # Handle host_build_iv properly
+%patch5003 -p1
+# Include pci device table so it gets autoloaded
 %patch5004 -p1
 
-
 #
 # final stuff
 #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- sources	3 Jan 2006 05:47:14 -0000	1.254
+++ sources	3 Jan 2006 10:57:13 -0000	1.255
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-7608b855b53933b07aeab428b876eff0  ieee80211softmac-20060102.tar.bz2
-9245e708ac8ccca2f68b793bb8f240ac  bcm43xx-20060102.tar.bz2
+96083b51cd30e60b86127113abed37a3  bcm43xx-20060103.tar.bz2
+1eb2bb778090c59fbeba6278d63a9309  ieee80211softmac-20060103.tar.bz2


--- linux-2.6-bcm43xx-txfix.patch DELETED ---


--- linux-2.6-bcm43xx-version.patch DELETED ---




More information about the fedora-cvs-commits mailing list