[kernel] r12652 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Martin Michlmayr]

Author: tbm
Date: Thu Jan 29 10:26:24 2009
New Revision: 12652

Log:
rt2x00: Fix VGC lower bound initialization. (Closes: #510607)


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/rt2x00-fix-vgc-lower-bounc-init.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Jan 29 10:26:24 2009
@@ -8,6 +8,9 @@
   * Fix sign-extend ABI issue w/ system calls on various 64-bit architectures
     (CVE-2009-0029)
 
+  [ Martin Michlmayr ]
+  * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
+
  -- dann frazier <dannf at debian.org>  Mon, 19 Jan 2009 13:11:06 -0700
 
 linux-2.6 (2.6.26-13) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/rt2x00-fix-vgc-lower-bounc-init.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/rt2x00-fix-vgc-lower-bounc-init.patch	Thu Jan 29 10:26:24 2009
@@ -0,0 +1,42 @@
+From: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Mon, 28 Jul 2008 08:20:12 +0000 (+0200)
+Subject: rt2x00: Fix VGC lower bound initialization
+X-Git-Tag: v2.6.27-rc2~2^2~24^2~7
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8d8acd46fb7e962ac04baef5a118d431fae6b0f6
+
+rt2x00: Fix VGC lower bound initialization
+
+When the EEPROM_BBPTUNE_VGC word is valid, we should
+override EEPROM_BBPTUNE_VGCLOWER field with the BBP
+value.
+
+And we should _not_ do that when EEPROM_BBPTUNE_R17 is valid.
+
+Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+
+diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
+index 3078417..c6f6eb6 100644
+--- a/drivers/net/wireless/rt2x00/rt2500usb.c
++++ b/drivers/net/wireless/rt2x00/rt2500usb.c
+@@ -1376,6 +1376,9 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
+ 		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
+ 		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
+ 		EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);
++	} else {
++		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
++		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
+ 	}
+ 
+ 	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R17, &word);
+@@ -1384,9 +1387,6 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
+ 		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);
+ 		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);
+ 		EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);
+-	} else {
+-		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
+-		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
+ 	}
+ 
+ 	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);

Modified: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14	(original)
+++ dists/sid/linux-2.6/debian/patches/series/14	Thu Jan 29 10:26:24 2009
@@ -46,3 +46,4 @@
 + bugfix/all/CVE-2009-0029/0042-System-call-wrappers-part-32.patch
 + bugfix/all/CVE-2009-0029/0043-System-call-wrappers-part-33.patch
 + bugfix/all/CVE-2009-0029/0044-s390-specific-system-call-wrappers.patch
++ bugfix/all/rt2x00-fix-vgc-lower-bounc-init.patch