]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net/dccp: expansion of error code size
authorYoichi Yuasa <yuasa@linux-mips.org>
Tue, 25 May 2010 01:37:02 +0000 (18:37 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:29:17 +0000 (10:29 -0700)
[ Upstream commit d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 ]

Because MIPS's EDQUOT value is 1133(0x46d).
It's larger than u8.

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/dccp/input.c

index 9ec717426024d0ab01a927653e4dd85134b72ef0..def29cafd6592f4fd0005ff903fb965978eaeecb 100644 (file)
@@ -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;