rpms/kernel/F-9 linux-2.6-wireless-rt2500pci-restoring-missing-line.patch, NONE, 1.1 kernel.spec, 1.766, 1.767

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11492

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-rt2500pci-restoring-missing-line.patch 
Log Message:
* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-40
- wireless: rt2500pci: restoring missing line


linux-2.6-wireless-rt2500pci-restoring-missing-line.patch:

--- NEW FILE linux-2.6-wireless-rt2500pci-restoring-missing-line.patch ---
>From bf4634afd8bb72936d2d56425ec792ca1bfa92a2 Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc at gelato.unsw.edu.au>
Date: Thu, 31 Jul 2008 10:56:34 +1000
Subject: rt2500pci: restoring missing line

In kernel version 2.6.26-rc9 my wireless LAN card worked; but in the
released 2.6.26, my RaLink rt2500 card wouldn't associate.

Git-bisect led me to this patch:

	61486e0f68d1f8966c09b734566a187d42d65c54
	rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()

I believe that there is a problem with that patch --- it
(inadvertantly) removes an extra line of code, that used to set the
DATABYTE_COUNT field.

This patch reinstates that line, and with it my card works again.

Signed-off-by: Peter Chubb <peterc at gelato.unsw.edu.au>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/rt2x00/rt2500pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index aa6dfb8..181a146 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1220,6 +1220,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
 			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
 	rt2x00_desc_write(txd, 0, word);
 }
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- kernel.spec	14 Sep 2008 01:57:25 -0000	1.766
+++ kernel.spec	14 Sep 2008 18:15:14 -0000	1.767
@@ -648,6 +648,7 @@
 #Patch682: linux-2.6-wireless-fixups.patch
 Patch683: linux-2.6-wireless-stable-backports.patch
 Patch685: linux-2.6-rt2500usb-fix.patch
+Patch686: linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1231,6 +1232,9 @@
 # fix for long-standing rt2500usb issues
 ApplyPatch linux-2.6-rt2500usb-fix.patch
 
+# bf4634afd8bb72936d2d56425ec792ca1bfa92a2
+ApplyPatch linux-2.6-wireless-rt2500pci-restoring-missing-line.patch
+
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
 
@@ -1862,6 +1866,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
+* Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-40
+- wireless: rt2500pci: restoring missing line
+
 * Sat Sep 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-39
 - libata: fix DMA mode mistmatches
 - libata: interpret the LBA28 spec properly