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

[Ben Hutchings]

Author: benh
Date: Tue Nov  8 01:58:57 2011
New Revision: 18238

Log:
iwlagn: fix modinfo display for 135 ucode (Closes: #647958)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.2

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Nov  8 01:55:58 2011	(r18237)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov  8 01:58:57 2011	(r18238)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * [alpha] wire up accept4 syscall, thanks to Michael Cree
+  * iwlagn: fix modinfo display for 135 ucode (Closes: #647958)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 04 Nov 2011 15:05:47 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch	Tue Nov  8 01:58:57 2011	(r18238)
@@ -0,0 +1,32 @@
+From: "Fry, Donald H" <donald.h.fry at intel.com>
+Date: Thu, 15 Sep 2011 11:46:37 -0700
+Subject: [PATCH] iwlagn: fix modinfo display for 135 ucode.
+
+commit 5092e47afcbe6c470094c32095794b16083dfac2 upstream.
+
+The modinfo report for 135 ucode is iwlwifi-135-IWL135_UCODE_API_MAX.ucode
+Change to show the value of the define:  iwlwifi-135-6.ucode
+
+Signed-off-by: Don Fry <donald.h.fry at intel.com>
+Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/iwlwifi/iwl-2000.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
+index 913f2a2..0579398 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
+@@ -75,7 +75,7 @@
+ #define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"
+ 
+ #define IWL135_FW_PRE "iwlwifi-135-"
+-#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE #api ".ucode"
++#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"
+ 
+ static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
+ {
+-- 
+1.7.7
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Tue Nov  8 01:55:58 2011	(r18237)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Tue Nov  8 01:58:57 2011	(r18238)
@@ -1 +1,2 @@
 + bugfix/alpha/alpha-wire-up-accept4-syscall.patch
++ bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch