[kernel] r16907 - dists/squeeze/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Thu Feb 17 22:28:28 2011
New Revision: 16907

Log:
Fix context in debian/patches/bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch

Modified:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch	Thu Feb 17 22:22:59 2011	(r16906)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch	Thu Feb 17 22:28:28 2011	(r16907)
@@ -1,8 +1,9 @@
-From 75f64dd54a185150ebfc45e99351c890d4a2252f Mon Sep 17 00:00:00 2001
 From: Ondrej Zary <linux at rainbow-software.org>
 Date: Wed, 23 Jun 2010 12:57:15 +0200
 Subject: [PATCH] rt2500usb: fallback to SW encryption for TKIP+AES
 
+commit 75f64dd54a185150ebfc45e99351c890d4a2252f upstream.
+
 HW crypto in rt2500usb does not seem to support keys with different ciphers,
 which breaks TKIP+AES mode. Fall back to software encryption to fix it.
 
@@ -15,16 +16,17 @@
 Signed-off-by: Ondrej Zary <linux at rainbow-software.org>
 Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>
 Signed-off-by: John W. Linville <linville at tuxdriver.com>
+[bwh: Adjust context for 2.6.32]
 ---
  drivers/net/wireless/rt2x00/rt2500usb.c |   10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
-index 002db64..963238c 100644
+index 56f4ea1..99d6fd7 100644
 --- a/drivers/net/wireless/rt2x00/rt2500usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
 @@ -347,6 +347,7 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
- {
+ 	int timeout;
  	u32 mask;
  	u16 reg;
 +	enum cipher curr_cipher;
@@ -52,8 +54,8 @@
 +		if (key->hw_key_idx > 0 && crypto->cipher != curr_cipher)
 +			return -EOPNOTSUPP;
  
- 		rt2500usb_register_multiwrite(rt2x00dev, reg,
- 					      crypto->key, sizeof(crypto->key));
+ 		/*
+ 		 * The encryption key doesn't fit within the CSR cache,
 -- 
 1.7.2.3