rpms/kernel/devel linux-2.6-wireless-reverts.patch, NONE, 1.1 patch-2.6.24-rc8-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.754, 1.755 kernel.spec, 1.372, 1.373 sources, 1.714, 1.715 upstream, 1.636, 1.637

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	linux-2.6-wireless-reverts.patch 
	patch-2.6.24-rc8-git4.bz2.sign 
Log Message:
* Mon Jan 21 2008 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.24-rc8-git4


linux-2.6-wireless-reverts.patch:

--- NEW FILE linux-2.6-wireless-reverts.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a38db5b6219d88e2b48f07472c436b19b864f93c
Commit:     a38db5b6219d88e2b48f07472c436b19b864f93c
Parent:     8ff9d21ee2ac7eceeb6ba3da52c3472dcab435e4
Author:     Stefano Brivio <stefano.brivio at polimi.it>
AuthorDate: Sun Jan 13 18:30:14 2008 +0100
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Wed Jan 16 12:53:32 2008 -0500

    b43: fix use-after-free rfkill bug
    
    Fix rfkill code which caused a use-after-free bug.
    
    Signed-off-by: Stefano Brivio <stefano.brivio at polimi.it>
    Acked-by: Michael Buesch <mb at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/b43/rfkill.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 98cf70c..11f53cb 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -138,8 +138,11 @@ void b43_rfkill_init(struct b43_wldev *dev)
 	rfk->rfkill->user_claim_unsupported = 1;
 
 	rfk->poll_dev = input_allocate_polled_device();
-	if (!rfk->poll_dev)
-		goto err_free_rfk;
+	if (!rfk->poll_dev) {
+		rfkill_free(rfk->rfkill);
+		goto err_freed_rfk;
+	}
+
 	rfk->poll_dev->private = dev;
 	rfk->poll_dev->poll = b43_rfkill_poll;
 	rfk->poll_dev->poll_interval = 1000; /* msecs */
@@ -175,8 +178,7 @@ err_unreg_rfk:
 err_free_polldev:
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-err_free_rfk:
-	rfkill_free(rfk->rfkill);
+err_freed_rfk:
 	rfk->rfkill = NULL;
 out_error:
 	rfk->registered = 0;
@@ -195,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *dev)
 	rfkill_unregister(rfk->rfkill);
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-	rfkill_free(rfk->rfkill);
 	rfk->rfkill = NULL;
 }
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e52742deef04ed7babec0f5866c867dd15d449f0
Commit:     e52742deef04ed7babec0f5866c867dd15d449f0
Parent:     cbd9c883696da72b2b1f03f909dbacc04bbf8b58
Author:     Randy Dunlap <randy.dunlap at oracle.com>
AuthorDate: Thu Jan 10 14:31:30 2008 -0800
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Wed Jan 16 12:53:32 2008 -0500

    hostap: section mismatch warning
    
    Fix section mismatch by changing variable name to match one of the
    whitelisted (allowable) names for pointing into init data:
    
    WARNING: vmlinux.o(.data+0xce618): Section mismatch: reference to .init.data:prism2_plx_id_table (between 'prism2_plx_drv_id' and 'dev_info')
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Acked-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/hostap/hostap_plx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 040dc3e..cbf15d7 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -608,7 +608,7 @@ static void prism2_plx_remove(struct pci_dev *pdev)
 
 MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
 
-static struct pci_driver prism2_plx_drv_id = {
+static struct pci_driver prism2_plx_driver = {
 	.name		= "hostap_plx",
 	.id_table	= prism2_plx_id_table,
 	.probe		= prism2_plx_probe,
@@ -618,13 +618,13 @@ static struct pci_driver prism2_plx_drv_id = {
 
 static int __init init_prism2_plx(void)
 {
-	return pci_register_driver(&prism2_plx_drv_id);
+	return pci_register_driver(&prism2_plx_driver);
 }
 
 
 static void __exit exit_prism2_plx(void)
 {
-	pci_unregister_driver(&prism2_plx_drv_id);
+	pci_unregister_driver(&prism2_plx_driver);
 }
 
 
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8ff9d21ee2ac7eceeb6ba3da52c3472dcab435e4
Commit:     8ff9d21ee2ac7eceeb6ba3da52c3472dcab435e4
Parent:     436c8854a05add153a9003b3aa19e54851ed902f
Author:     Stefano Brivio <stefano.brivio at polimi.it>
AuthorDate: Sat Jan 12 23:12:26 2008 +0100
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Wed Jan 16 12:53:32 2008 -0500

    ipw2200: fix typo in kerneldoc
    
    Fix a typo in kerneldoc for ipw2200.
    
    Signed-off-by: Stefano Brivio <stefano.brivio at polimi.it>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/ipw2200.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 88062c1..003f73f 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4935,7 +4935,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
 /**
  * Reclaim Tx queue entries no more used by NIC.
  *
- * When FW adwances 'R' index, all entries between old and
+ * When FW advances 'R' index, all entries between old and
  * new 'R' index need to be reclaimed. As result, some free space
  * forms. If there is enough free space (> low mark), wake Tx queue.
  *
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d101f6496d51cbeb285f531dff059ce0ef28ffe3
Commit:     d101f6496d51cbeb285f531dff059ce0ef28ffe3
Parent:     a38db5b6219d88e2b48f07472c436b19b864f93c
Author:     Ivo van Doorn <ivdoorn at gmail.com>
AuthorDate: Fri Jan 11 20:53:07 2008 +0100
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Wed Jan 16 12:53:32 2008 -0500

    rt2x00: Fix ieee80211 payload alignment
    
    As Johannes Berg indicated, the NET_IP_ALIGN doesn't
    need to be used for ieee80211 frames. This means we
    can simplify the alignment calculation to just
    use the result of the header size modulus 4 as frame
    alignment.
    
    Furthermore we shouldn't use NET_IP_ALIGN in rt2x00usb
    because it could be 0 on some architectures and we absolutely
    need to have 2 bytes reserved for possible aligning.
    
    Signed-off-by: Ivo van Doorn<IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/rt2x00/rt2x00pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 6d5d9ab..04663eb 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -149,7 +149,7 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 		 * The data behind the ieee80211 header must be
 		 * aligned on a 4 byte boundary.
 		 */
-		align = NET_IP_ALIGN + (2 * (header_size % 4 == 0));
+		align = header_size % 4;
 
 		/*
 		 * Allocate the sk_buffer, initialize it and copy
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index ab4797e..568d738 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -245,13 +245,20 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	 * Allocate a new sk buffer to replace the current one.
 	 * If allocation fails, we should drop the current frame
 	 * so we can recycle the existing sk buffer for the new frame.
+	 * As alignment we use 2 and not NET_IP_ALIGN because we need
+	 * to be sure we have 2 bytes room in the head. (NET_IP_ALIGN
+	 * can be 0 on some hardware). We use these 2 bytes for frame
+	 * alignment later, we assume that the chance that
+	 * header_size % 4 == 2 is bigger then header_size % 2 == 0
+	 * and thus optimize alignment by reserving the 2 bytes in
+	 * advance.
 	 */
 	frame_size = entry->ring->data_size + entry->ring->desc_size;
-	skb = dev_alloc_skb(frame_size + NET_IP_ALIGN);
+	skb = dev_alloc_skb(frame_size + 2);
 	if (!skb)
 		goto skip_entry;
 
-	skb_reserve(skb, NET_IP_ALIGN);
+	skb_reserve(skb, 2);
 	skb_put(skb, frame_size);
 
 	/*
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=436c8854a05add153a9003b3aa19e54851ed902f
Commit:     436c8854a05add153a9003b3aa19e54851ed902f
Parent:     e52742deef04ed7babec0f5866c867dd15d449f0
Author:     Marc Pignat <marc.pignat at hevs.ch>
AuthorDate: Fri Jan 11 16:12:28 2008 +0100
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Wed Jan 16 12:53:32 2008 -0500

    wireless/libertas support for 88w8385 sdio older revision
    
    Identifiaction of another revision of 88w8385 in sdio mode.
    
    Signed-off-by: Marc Pignat <marc.pignat at hevs.ch>
    Acked-by: Pierre Ossman <drzeus at drzeus.cx>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/libertas/if_sdio.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index b24425f..4f1efb1 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -871,6 +871,10 @@ static int if_sdio_probe(struct sdio_func *func,
 		if (sscanf(func->card->info[i],
 				"ID: %x", &model) == 1)
 			break;
+               if (!strcmp(func->card->info[i], "IBIS Wireless SDIO Card")) {
+                       model = 4;
+                       break;
+               }
 	}
 
 	if (i == func->card->num_info) {


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

iD8DBQBHkvIqyGugalF9Dw4RAtpyAJ0d8K2hMy7hhiLtsQkcT5XTPLl+SgCfaU6Y
ON2an2T/tLTxl5/auNkC6ao=
=33O1
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- .cvsignore	16 Jan 2008 17:35:23 -0000	1.754
+++ .cvsignore	21 Jan 2008 23:09:20 -0000	1.755
@@ -5,3 +5,4 @@
 kernel-2.6.23
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc8.bz2
+patch-2.6.24-rc8-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- kernel.spec	21 Jan 2008 22:12:49 -0000	1.372
+++ kernel.spec	21 Jan 2008 23:09:20 -0000	1.373
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -620,6 +620,7 @@
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch670: linux-2.6-ata-quirk.patch
+Patch679: linux-2.6-wireless-reverts.patch
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch682: linux-2.6-wireless-pending-too.patch
@@ -1124,6 +1125,8 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
+# revert already-merged wireless patches
+ApplyPatch linux-2.6-wireless-reverts.patch -R
 # wireless patches headed for 2.6.24
 ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.25
@@ -1757,6 +1760,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Jan 21 2008 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.24-rc8-git4
+
 * Mon Jan 21 2008 Adam Jackson <ajax at redhat.com>
 - Disable MODULE_DEVICE_TABLE patch for i915 and radeon, it makes things
   very unhappy.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -r1.714 -r1.715
--- sources	16 Jan 2008 17:35:24 -0000	1.714
+++ sources	21 Jan 2008 23:09:20 -0000	1.715
@@ -1,2 +1,3 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
 527687c63f4252989dba6fb92baf9707  patch-2.6.24-rc8.bz2
+21bf79423e7593b0759f7e715c02aa45  patch-2.6.24-rc8-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- upstream	16 Jan 2008 17:35:24 -0000	1.636
+++ upstream	21 Jan 2008 23:09:20 -0000	1.637
@@ -1,2 +1,3 @@
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc8.bz2
+patch-2.6.24-rc8-git4.bz2