From patchwork Tue Nov 23 12:36:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerrit Renker X-Patchwork-Id: 72646 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6B246B70D6 for ; Tue, 23 Nov 2010 23:37:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753440Ab0KWMhJ (ORCPT ); Tue, 23 Nov 2010 07:37:09 -0500 Received: from dee.erg.abdn.ac.uk ([139.133.204.82]:43309 "EHLO erg.abdn.ac.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753408Ab0KWMhF (ORCPT ); Tue, 23 Nov 2010 07:37:05 -0500 Received: from laptev.erg.abdn.ac.uk (Debian-exim@ra-gerrit.erg.abdn.ac.uk [139.133.204.38]) by erg.abdn.ac.uk (8.13.4/8.13.4) with ESMTP id oANCavEq012096 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 23 Nov 2010 12:36:57 GMT Received: from gerrit by laptev.erg.abdn.ac.uk with local (Exim 4.69) (envelope-from ) id 1PKs7E-00018u-Kx; Tue, 23 Nov 2010 13:36:57 +0100 Date: Tue, 23 Nov 2010 13:36:56 +0100 From: Gerrit Renker To: David Miller Cc: dccp@vger.kernel.org, netdev@vger.kernel.org Subject: net-2.6 [Patch 1/1][BUG-FIX] dccp: advancing the Ack window Message-ID: <20101123123656.GB3915@gerrit.erg.abdn.ac.uk> Mail-Followup-To: Gerrit Renker , David Miller , dccp@vger.kernel.org, netdev@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-ERG-MailScanner: Found to be clean X-ERG-MailScanner-From: gerrit@erg.abdn.ac.uk X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Dave, please can you consider the following bug fix (applies on both net-2.6 and net-next-2.6). I have no other dccp patches this week -- the second one that follows is for the test tree only and is meant for RFC. Best regards Gerrit (also on git://eden-feed.erg.abdn.ac.uk/net-next-2.6 [subtree 'dccp']) >>>>>>>>>>>>>>>>>>>>>>>>>>>> Patch / Fix <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< dccp: fix error in updating the GAR This fixes a bug in updating the Greatest Acknowledgment number Received (GAR): the current implementation does not track the greatest received value - lower values in the range AWL..AWH (RFC 4340, 7.5.1) erase higher ones. Signed-off-by: Gerrit Renker --- net/dccp/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/dccp/input.c +++ b/net/dccp/input.c @@ -241,7 +241,8 @@ static int dccp_check_seqno(struct sock dccp_update_gsr(sk, seqno); if (dh->dccph_type != DCCP_PKT_SYNC && - (ackno != DCCP_PKT_WITHOUT_ACK_SEQ)) + ackno != DCCP_PKT_WITHOUT_ACK_SEQ && + after48(ackno, dp->dccps_gar)) dp->dccps_gar = ackno; } else { unsigned long now = jiffies;