[kernel] r16197 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Sun Aug 29 00:28:41 2010
New Revision: 16197

Log:
rt2860sta, rt2870sta: Enable channels 12-14 (Closes: #594561)

Added:
   dists/sid/linux-2.6/debian/patches/debian/rt-2860-2870-sta-Enable-channels-12-14.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Aug 28 23:38:28 2010	(r16196)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 29 00:28:41 2010	(r16197)
@@ -11,6 +11,7 @@
       (avoids regression for Xen tools)
   * Add drm changes from stable 2.6.34.6:
     - drm: stop information leak of old kernel stack (CVE-2010-2803)
+  * rt2860sta, rt2870sta: Enable channels 12-14 (Closes: #594561)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 27 Aug 2010 08:38:26 +0100
 

Added: dists/sid/linux-2.6/debian/patches/debian/rt-2860-2870-sta-Enable-channels-12-14.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/rt-2860-2870-sta-Enable-channels-12-14.patch	Sun Aug 29 00:28:41 2010	(r16197)
@@ -0,0 +1,31 @@
+From 790a74fea5ccc6a88a0dad309d9c737b98cfb35a Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 29 Aug 2010 01:23:11 +0100
+Subject: [PATCH] rt{2860,2870}sta: Enable channels 12-14
+
+These drivers attempt to limit the available radio channels according
+to national regulations, but they currently have no mechanism for
+setting the country so they always use the default limits.  Change the
+default limits to allow use of channels 12-14.
+---
+ drivers/staging/rt2860/common/rt_channel.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/staging/rt2860/common/rt_channel.c b/drivers/staging/rt2860/common/rt_channel.c
+index 5387989..2b8508b 100644
+--- a/drivers/staging/rt2860/common/rt_channel.c
++++ b/drivers/staging/rt2860/common/rt_channel.c
+@@ -1405,8 +1405,8 @@ struct rt_ch_region ChRegion[] = {
+ 	 "",
+ 	 CE,
+ 	 {
+-	  {1, 11, 20, BOTH, FALSE}
+-	  ,			/* 2.4 G, ch 1~11 */
++	  {1, 14, 20, BOTH, FALSE}
++	  ,			/* 2.4 G, ch 1~14 */
+ 	  {36, 4, 20, BOTH, FALSE}
+ 	  ,			/* 5G, ch 52~64 */
+ 	  {52, 4, 20, BOTH, FALSE}
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Sat Aug 28 23:38:28 2010	(r16196)
+++ dists/sid/linux-2.6/debian/patches/series/22	Sun Aug 29 00:28:41 2010	(r16197)
@@ -27,3 +27,4 @@
 + bugfix/all/drm-radeon-kms-DCE3-switch-pads-to-ddc-mode-when-goi.patch
 + bugfix/all/drm-radeon-kms-fix-sideport-detection-on-newer-rs880.patch
 + bugfix/all/drm-stop-information-leak-of-old-kernel-stack.patch
++ debian/rt-2860-2870-sta-Enable-channels-12-14.patch