From: David Howells <dhowells@redhat.com>
Date: Thu, 24 Apr 2008 19:38:56 +0000 (+0100)
Subject: RxRPC: Fix a regression in the RXKAD security module
X-Git-Tag: v2.6.26-rc1~1080
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=02f370506822cbff60bbf5b685053fa2e8640811;p=linux-2.6-omap-h63xx.git

RxRPC: Fix a regression in the RXKAD security module

Fix a regression in the RXKAD security module introduced in:

	commit 91e916cffec7c0153c5cbaa447151862a7a9a047
	Author: Al Viro <viro@ftp.linux.org.uk>
	Date:   Sat Mar 29 03:08:38 2008 +0000

	net/rxrpc trivial annotations

A variable was declared as a 16-bit type rather than a 32-bit type.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-with-apologies-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-of-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 6d38a81b336..ba3f6e49fdd 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -493,8 +493,8 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
 		__be32 x[2];
 	} tmpbuf __attribute__((aligned(8))); /* must all be in same page */
 	__be32 x;
-	u16 y;
 	__be16 cksum;
+	u32 y;
 	int ret;
 
 	sp = rxrpc_skb(skb);