aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2010-05-24 18:37:02 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-24 18:37:02 -0700
commitd9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 (patch)
tree2d611234ea1cd228a74b21049336149e19956700 /net
parent5eb32bd059379530fc3809a7fcf183feca75f601 (diff)
downloadkernel_samsung_aries-d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179.zip
kernel_samsung_aries-d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179.tar.gz
kernel_samsung_aries-d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179.tar.bz2
net/dccp: expansion of error code size
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>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 58f7bc1..6beb6a7 100644
--- a/net/dccp/input.c
+++ b/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;