Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198594
b: refs/heads/master
c: d9b52dc
h: refs/heads/master
v: v3
  • Loading branch information
Yoichi Yuasa authored and David S. Miller committed May 25, 2010
1 parent 21964b5 commit 1fc2402
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5eb32bd059379530fc3809a7fcf183feca75f601
refs/heads/master: d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179
6 changes: 3 additions & 3 deletions trunk/net/dccp/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;

Expand Down

0 comments on commit 1fc2402

Please sign in to comment.