From fc86c6762c2256a8a32897d1b909e0c75fb25829 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Wed, 28 Nov 2007 12:06:04 -0200 Subject: [PATCH] --- yaml --- r: 78226 b: refs/heads/master c: 3159afe0d2c1994392c269cf9dee2797830d016b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/input.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 90195a1ceeaa..edfb83e99c38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c869620762fea4b3acf6502d9e80840b27ec642 +refs/heads/master: 3159afe0d2c1994392c269cf9dee2797830d016b diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c index fe4b0fbfa508..decf2f21149b 100644 --- a/trunk/net/dccp/input.c +++ b/trunk/net/dccp/input.c @@ -629,16 +629,14 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, return 0; /* * Step 7: Check for unexpected packet types - * If (S.is_server and P.type == CloseReq) - * or (S.is_server and P.type == Response) + * If (S.is_server and P.type == Response) * or (S.is_client and P.type == Request) * or (S.state == RESPOND and P.type == Data), * Send Sync packet acknowledging P.seqno * Drop packet and return */ } else if ((dp->dccps_role != DCCP_ROLE_CLIENT && - (dh->dccph_type == DCCP_PKT_RESPONSE || - dh->dccph_type == DCCP_PKT_CLOSEREQ)) || + dh->dccph_type == DCCP_PKT_RESPONSE) || (dp->dccps_role == DCCP_ROLE_CLIENT && dh->dccph_type == DCCP_PKT_REQUEST) || (sk->sk_state == DCCP_RESPOND &&