rpms/kernel/F-8 patch-2.6.25.12.bz2.sign, NONE, 1.1 .cvsignore, 1.729, 1.730 kernel.spec, 1.501, 1.502 linux-2.6-upstream-reverts.patch, 1.11, 1.12 sources, 1.690, 1.691 linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch, 1.1, NONE linux-2.6-hwmon-hdaps-add-new-models.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)]

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources 
Added Files:
	patch-2.6.25.12.bz2.sign 
Removed Files:
	linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch 
	linux-2.6-hwmon-hdaps-add-new-models.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-8/.cvsignore,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- .cvsignore	13 Jul 2008 22:13:58 -0000	1.729
+++ .cvsignore	24 Jul 2008 21:18:53 -0000	1.730
@@ -4,3 +4,4 @@
 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-8/kernel.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- kernel.spec	22 Jul 2008 20:00:38 -0000	1.501
+++ kernel.spec	24 Jul 2008 21:18:53 -0000	1.502
@@ -33,7 +33,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}
@@ -626,7 +626,6 @@
 Patch426: linux-2.6-fs-fat-cleanup-code.patch
 Patch427: linux-2.6-fs-fat-fix-setattr.patch
 Patch428: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch
-Patch429: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch
@@ -673,11 +672,6 @@
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 
 Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-Patch1310: linux-2.6-usb-fix-interrupt-disabling.patch
-# fix timer regression (queued for 2.6.25.12)
-Patch1314: linux-2.6-usb-ehci-fix-timer-regression.patch
-
-Patch1350: linux-2.6-hwmon-hdaps-add-new-models.patch
 
 Patch1400: linux-2.6-smarter-relatime.patch
 
@@ -1126,8 +1120,6 @@
 ApplyPatch linux-2.6-fs-fat-cleanup-code.patch
 ApplyPatch linux-2.6-fs-fat-fix-setattr.patch
 ApplyPatch linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch
-# fix reiserfs hang (from F9)
-ApplyPatch linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch
 
 # Networking
 # Disable easy to trigger printk's.
@@ -1231,16 +1223,9 @@
 # USB
 # respect the 'nousb' boot option
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# make USB work with shared interrupts
-ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch
-
-ApplyPatch linux-2.6-usb-ehci-fix-timer-regression.patch
 
 # ISDN
 
-# hwmon
-ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch
-
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
 
@@ -1856,6 +1841,9 @@
 
 
 %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-8/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-upstream-reverts.patch	3 Jul 2008 21:27:53 -0000	1.11
+++ linux-2.6-upstream-reverts.patch	24 Jul 2008 21:18:53 -0000	1.12
@@ -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-8/sources,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- sources	13 Jul 2008 22:13:58 -0000	1.690
+++ sources	24 Jul 2008 21:18:53 -0000	1.691
@@ -1,2 +1,3 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
 86abbd32d5cfd382782ffc7a924e7574  patch-2.6.25.11.bz2
+584efcae6ee19b118e3b013e939df04f  patch-2.6.25.12.bz2


--- linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch DELETED ---


--- linux-2.6-hwmon-hdaps-add-new-models.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 ---