rpms/kernel/F-9 patch-2.6.25.12.bz2.sign, NONE, 1.1 .cvsignore, 1.819, 1.820 kernel.spec, 1.718, 1.719 linux-2.6-upstream-reverts.patch, 1.6, 1.7 sources, 1.780, 1.781 upstream, 1.699, 1.700 linux-2.6-hwmon-hdaps-add-new-models.patch, 1.1, NONE linux-2.6-reiserfs-discard-prealloc.patch, 1.1, NONE linux-2.6-usb-ehci-fix-timer-regression.patch, 1.1, NONE linux-2.6-usb-fix-interrupt-disabling.patch, 1.1, NONE patch-2.6.25.11.bz2.sign, 1.1, NONE

Kyle McMartin (kyle) fedora-extras-commits at redhat.com
Thu Jul 24 21:07:21 UTC 2008


Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28225

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.25.12.bz2.sign 
Removed Files:
	linux-2.6-hwmon-hdaps-add-new-models.patch 
	linux-2.6-reiserfs-discard-prealloc.patch 
	linux-2.6-usb-ehci-fix-timer-regression.patch 
	linux-2.6-usb-fix-interrupt-disabling.patch 
	patch-2.6.25.11.bz2.sign 
Log Message:
* Thu Jul 24 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25.12



--- NEW FILE patch-2.6.25.12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIiK/ryGugalF9Dw4RAoj9AKCEe7e0V+1fPeM2qo/a7yfrFMjHzgCffs1D
gSkALHWYpBZZAEKJL45Q9bE=
=/WEy
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- .cvsignore	13 Jul 2008 22:13:04 -0000	1.819
+++ .cvsignore	24 Jul 2008 21:06:33 -0000	1.820
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.11.bz2
+patch-2.6.25.12.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -r1.718 -r1.719
--- kernel.spec	22 Jul 2008 20:02:02 -0000	1.718
+++ kernel.spec	24 Jul 2008 21:06:33 -0000	1.719
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 11
+%define stable_update 12
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -625,14 +625,12 @@
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 Patch452: linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
-Patch453: linux-2.6-hwmon-hdaps-add-new-models.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 Patch590: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
-Patch611: linux-2.6-reiserfs-discard-prealloc.patch
 
 # libata
 Patch670: linux-2.6-ata-quirk.patch
@@ -697,10 +695,6 @@
 Patch2301: linux-2.6-ms-wireless-receiver.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=454028
 Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch
-# fix interrupt handling
-Patch2303: linux-2.6-usb-fix-interrupt-disabling.patch
-# fix timer regression (queued for 2.6.25.12)
-Patch2304: linux-2.6-usb-ehci-fix-timer-regression.patch
 
 # usb video
 Patch2400: linux-2.6-uvcvideo.patch
@@ -1117,8 +1111,6 @@
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-storage-nikond80-quirk.patch
-ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch
-ApplyPatch linux-2.6-usb-ehci-fix-timer-regression.patch
 
 # ACPI
 # acpi has a bug in the sizeof function causing thermal panics (from 2.6.26)
@@ -1195,8 +1187,6 @@
 ApplyPatch linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 # kill annoying applesmc debug messages
 ApplyPatch linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
-# add new models to hdaps
-ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1215,9 +1205,6 @@
 # Use UTF-8 by default on VFAT.
 ApplyPatch linux-2.6-defaults-fat-utf8.patch
 
-# Fix reiserfs list corruption
-ApplyPatch linux-2.6-reiserfs-discard-prealloc.patch
-
 # libata
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
@@ -1896,6 +1883,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Jul 24 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25.12
+
 * Tue Jul 22 2008 Kyle McMartin <kmcmartin at redhat.com>
 - libata-acpi: fix calling sleeping function in irq context (#451896, #454954)
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-upstream-reverts.patch	3 Jul 2008 21:17:32 -0000	1.6
+++ linux-2.6-upstream-reverts.patch	24 Jul 2008 21:06:33 -0000	1.7
@@ -587,3 +587,120 @@
  }
  
  /*
+diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
+index 0aac1ff..23d4c09 100644
+--- a/drivers/net/wireless/b43/leds.c
++++ b/drivers/net/wireless/b43/leds.c
+@@ -72,6 +72,9 @@ static void b43_led_brightness_set(struct led_classdev *led_dev,
+ 	struct b43_wldev *dev = led->dev;
+ 	bool radio_enabled;
+ 
++	if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED))
++		return;
++
+ 	/* Checking the radio-enabled status here is slightly racy,
+ 	 * but we want to avoid the locking overhead and we don't care
+ 	 * whether the LED has the wrong state for a second. */
+diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
+index b4a2042..b2cc246 100644
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -2607,7 +2607,7 @@ static int b43_op_tx(struct ieee80211_hw *hw,
+ 	int err;
+ 
+ 	if (unlikely(!dev))
+-		return NETDEV_TX_BUSY;
++		goto drop_packet;
+ 
+ 	/* Transmissions on seperate queues can run concurrently. */
+ 	read_lock_irqsave(&wl->tx_lock, flags);
+@@ -2619,7 +2619,12 @@ static int b43_op_tx(struct ieee80211_hw *hw,
+ 	read_unlock_irqrestore(&wl->tx_lock, flags);
+ 
+ 	if (unlikely(err))
+-		return NETDEV_TX_BUSY;
++		goto drop_packet;
++	return NETDEV_TX_OK;
++
++drop_packet:
++	/* We can not transmit this packet. Drop it. */
++	dev_kfree_skb_any(skb);
+ 	return NETDEV_TX_OK;
+ }
+ 
+diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
+index c990f87..93ddc1c 100644
+--- a/drivers/net/wireless/b43legacy/dma.c
++++ b/drivers/net/wireless/b43legacy/dma.c
+@@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
+ 	if (!ring)
+ 		goto out;
+ 	ring->type = type;
++	ring->dev = dev;
+ 
+ 	nr_slots = B43legacy_RXRING_SLOTS;
+ 	if (for_tx)
+@@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
+ 				 DMA_TO_DEVICE);
+ 	}
+ 
+-	ring->dev = dev;
+ 	ring->nr_slots = nr_slots;
+ 	ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index);
+ 	ring->index = controller_index;
+diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
+index 0f7a6e7..531aeb2 100644
+--- a/drivers/net/wireless/b43legacy/main.c
++++ b/drivers/net/wireless/b43legacy/main.c
+@@ -2350,8 +2350,10 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw,
+ 	} else
+ 		err = b43legacy_dma_tx(dev, skb, ctl);
+ out:
+-	if (unlikely(err))
+-		return NETDEV_TX_BUSY;
++	if (unlikely(err)) {
++		/* Drop the packet. */
++		dev_kfree_skb_any(skb);
++	}
+ 	return NETDEV_TX_OK;
+ }
+ 
+diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
+index 7942b15..17efe4f 100644
+--- a/drivers/net/wireless/zd1211rw/zd_usb.c
++++ b/drivers/net/wireless/zd1211rw/zd_usb.c
+@@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = {
+ 	{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
++	{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 67b509e..9bdaed8 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1090,7 +1090,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
+ 	ieee80211_tx_handler *handler;
+ 	struct ieee80211_txrx_data tx;
+ 	ieee80211_txrx_result res = TXRX_DROP, res_prepare;
+-	int ret, i;
++	int ret, i, retries = 0;
+ 
+ 	WARN_ON(__ieee80211_queue_pending(local, control->queue));
+ 
+@@ -1181,6 +1181,13 @@ retry:
+ 		if (!__ieee80211_queue_stopped(local, control->queue)) {
+ 			clear_bit(IEEE80211_LINK_STATE_PENDING,
+ 				  &local->state[control->queue]);
++			retries++;
++			/*
++			 * Driver bug, it's rejecting packets but
++			 * not stopping queues.
++			 */
++			if (WARN_ON_ONCE(retries > 5))
++				goto drop;
+ 			goto retry;
+ 		}
+ 		memcpy(&store->control, control,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- sources	13 Jul 2008 22:13:04 -0000	1.780
+++ sources	24 Jul 2008 21:06:33 -0000	1.781
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-86abbd32d5cfd382782ffc7a924e7574  patch-2.6.25.11.bz2
+584efcae6ee19b118e3b013e939df04f  patch-2.6.25.12.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- upstream	13 Jul 2008 22:13:04 -0000	1.699
+++ upstream	24 Jul 2008 21:06:33 -0000	1.700
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.11.bz2
+patch-2.6.25.12.bz2


--- linux-2.6-hwmon-hdaps-add-new-models.patch DELETED ---


--- linux-2.6-reiserfs-discard-prealloc.patch DELETED ---


--- linux-2.6-usb-ehci-fix-timer-regression.patch DELETED ---


--- linux-2.6-usb-fix-interrupt-disabling.patch DELETED ---


--- patch-2.6.25.11.bz2.sign DELETED ---




More information about the fedora-extras-commits mailing list