From 1fc2402a3fb678b0d194c370afe5c92885a8f54e Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Mon, 24 May 2010 18:37:02 -0700
Subject: [PATCH] --- yaml --- r: 198594 b: refs/heads/master c:
 d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/dccp/input.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 57858b871271..1a64085ca06a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb32bd059379530fc3809a7fcf183feca75f601
+refs/heads/master: d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179
diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c
index 58f7bc156850..6beb6a7d6fba 100644
--- a/trunk/net/dccp/input.c
+++ b/trunk/net/dccp/input.c
@@ -124,9 +124,9 @@ static int dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb)
 	return queued;
 }
 
-static u8 dccp_reset_code_convert(const u8 code)
+static u16 dccp_reset_code_convert(const u8 code)
 {
-	const u8 error_code[] = {
+	const u16 error_code[] = {
 	[DCCP_RESET_CODE_CLOSED]	     = 0,	/* normal termination */
 	[DCCP_RESET_CODE_UNSPECIFIED]	     = 0,	/* nothing known */
 	[DCCP_RESET_CODE_ABORTED]	     = ECONNRESET,
@@ -148,7 +148,7 @@ static u8 dccp_reset_code_convert(const u8 code)
 
 static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb)
 {
-	u8 err = dccp_reset_code_convert(dccp_hdr_reset(skb)->dccph_reset_code);
+	u16 err = dccp_reset_code_convert(dccp_hdr_reset(skb)->dccph_reset_code);
 
 	sk->sk_err = err;