rpms/kernel/F-7 linux-2.6-21.3.patch, NONE, 1.1 kernel-2.6.spec, 1.3200, 1.3201

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-21.3.patch 
Log Message:
* Thu May 24 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.21.3 incremental patch from mailing list


linux-2.6-21.3.patch:

--- NEW FILE linux-2.6-21.3.patch ---
diff --git a/Makefile b/Makefile
index 22839cb..7980f39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 21
-EXTRAVERSION = .2
+EXTRAVERSION = .3
 NAME = Nocturnal Monster Puppy
 
 # *DOCUMENTATION*
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 6d3840e..6a86958 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -102,10 +102,15 @@ geode_aes_crypt(struct geode_aes_op *op)
 	u32 flags = 0;
 	unsigned long iflags;
 
-	if (op->len == 0 || op->src == op->dst)
+	if (op->len == 0)
 		return 0;
 
-	if (op->flags & AES_FLAGS_COHERENT)
+	/* If the source and destination is the same, then
+	 * we need to turn on the coherent flags, otherwise
+	 * we don't need to worry
+	 */
+
+	if (op->src == op->dst)
 		flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
 
 	if (op->dir == AES_DIR_ENCRYPT)
@@ -120,7 +125,7 @@ geode_aes_crypt(struct geode_aes_op *op)
 		_writefield(AES_WRITEIV0_REG, op->iv);
 	}
 
-	if (op->flags & AES_FLAGS_USRKEY) {
+	if (!(op->flags & AES_FLAGS_HIDDENKEY)) {
 		flags |= AES_CTRL_WRKEY;
 		_writefield(AES_WRITEKEY0_REG, op->key);
 	}
@@ -289,6 +294,7 @@ static struct crypto_alg geode_cbc_alg = {
 			.setkey			=	geode_setkey,
 			.encrypt		=	geode_cbc_encrypt,
 			.decrypt		=	geode_cbc_decrypt,
+			.ivsize			=	AES_IV_LENGTH,
 		}
 	}
 };
diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index 8003a36..f479686 100644
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -20,8 +20,7 @@
 #define AES_DIR_DECRYPT 0
 #define AES_DIR_ENCRYPT 1
 
-#define AES_FLAGS_USRKEY   (1 << 0)
-#define AES_FLAGS_COHERENT (1 << 1)
+#define AES_FLAGS_HIDDENKEY (1 << 0)
 
 struct geode_aes_op {
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3200
retrieving revision 1.3201
diff -u -r1.3200 -r1.3201
--- kernel-2.6.spec	24 May 2007 20:18:25 -0000	1.3200
+++ kernel-2.6.spec	24 May 2007 22:44:05 -0000	1.3201
@@ -393,6 +393,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21.2.bz2
+Patch2: linux-2.6-21.3.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1053,6 +1054,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2422,6 +2424,9 @@
 
 %changelog
 * Thu May 24 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.21.3 incremental patch from mailing list
+
+* Thu May 24 2007 Chuck Ebbert <cebbert at redhat.com>
 - Two UDF bugfixes.
 
 * Thu May 24 2007 Dave Jones <davej at redhat.com>