rpms/kernel/devel config-generic, 1.96, 1.97 kernel.spec, 1.616, 1.617 linux-2.6-wireless-pending.patch, 1.44, 1.45

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25855

Modified Files:
	config-generic kernel.spec linux-2.6-wireless-pending.patch 
Log Message:
Reenable wireless patches


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- config-generic	12 Apr 2008 16:40:10 -0000	1.96
+++ config-generic	15 Apr 2008 15:29:52 -0000	1.97
@@ -1303,7 +1303,7 @@
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLCORE_RFKILL=y
 CONFIG_IWL4965=m
-CONFIG_IWL4965_DEBUG=y
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWL4965_SENSITIVITY=y
 CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- kernel.spec	15 Apr 2008 14:08:32 -0000	1.616
+++ kernel.spec	15 Apr 2008 15:29:52 -0000	1.617
@@ -1120,10 +1120,10 @@
 # wireless patches headed for 2.6.25
 #ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
-#ApplyPatch linux-2.6-wireless-pending.patch
+ApplyPatch linux-2.6-wireless-pending.patch
 
 # Add misc wireless bits from upstream wireless tree
-#ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-at76.patch
 
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
@@ -1762,6 +1762,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
+* Tue Apr 15 2008 John W. Linville <linville at redhat.com>
+- Reenable wireless patches
+
 * Tue Apr 15 2008 Jarod Wilson <jwilson at redhat.com>
 - Fix kernel_variant_preun() to properly remove flavoured kernel
   entries from bootloader config (Mark McLoughlin)

linux-2.6-wireless-pending.patch:

Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- linux-2.6-wireless-pending.patch	8 Apr 2008 04:17:20 -0000	1.44
+++ linux-2.6-wireless-pending.patch	15 Apr 2008 15:29:52 -0000	1.45
@@ -87097,13 +87097,13 @@
  	 * beacon frame.
  	 */
 -	if (skb_headroom(skb) < TXD_DESC_SIZE) {
--		if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) {
+-		if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC))
 +	if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
 +		if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
-+				     0, GFP_ATOMIC)) {
- 			dev_kfree_skb(skb);
++				     0, GFP_ATOMIC))
  			return -ENOMEM;
- 		}
+ 	}
+ 
 @@ -2408,29 +2388,47 @@ static int rt61pci_beacon_update(struct 
  	/*
  	 * Add the descriptor in front of the skb.