From patchwork Wed Mar 17 12:16:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennart Schulte X-Patchwork-Id: 47941 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 D2C7FB7D00 for ; Wed, 17 Mar 2010 23:15:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754729Ab0CQMPs (ORCPT ); Wed, 17 Mar 2010 08:15:48 -0400 Received: from mta-2.ms.rz.RWTH-Aachen.DE ([134.130.7.73]:62202 "EHLO mta-2.ms.rz.rwth-aachen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754710Ab0CQMPr (ORCPT ); Wed, 17 Mar 2010 08:15:47 -0400 Content-transfer-encoding: 7BIT Received: from ironport-out-1.rz.rwth-aachen.de ([134.130.5.40]) by mta-2.ms.rz.RWTH-Aachen.de (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008)) with ESMTP id <0KZF0028QE29CVB0@mta-2.ms.rz.RWTH-Aachen.de> for netdev@vger.kernel.org; Wed, 17 Mar 2010 13:15:45 +0100 (CET) X-IronPort-AV: E=Sophos; i="4.49,657,1262559600"; d="scan'208"; a="49267676" Received: from relay-2.ms.rz.rwth-aachen.de (HELO relay.rwth-aachen.de) ([134.130.7.75]) by ironport-in-1.rz.rwth-aachen.de with ESMTP; Wed, 17 Mar 2010 13:15:45 +0100 Received: from localhost.localdomain (umic-mesh-137-226-54-92.nn.RWTH-Aachen.DE [137.226.54.92] (may be forged)) by relay.rwth-aachen.de (8.13.8+Sun/8.13.8/1) with ESMTP id o2HCFjq6007332; Wed, 17 Mar 2010 13:15:45 +0100 (CET) From: Lennart Schulte To: netdev@vger.kernel.org Cc: ilpo.jarvinen@helsinki.fi, Lennart Schulte , Arnd Hannemann Subject: [PATCH] tcp: Fix tcp_mark_head_lost() with packets == 0 Date: Wed, 17 Mar 2010 13:16:29 +0100 Message-id: <1268828189-22182-1-git-send-email-lennart.schulte@nets.rwth-aachen.de> X-Mailer: git-send-email 1.6.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A packet is marked as lost in case packets == 0, although nothing should be done. This results in a too early retransmitted packet during recovery in some cases. This small patch fixes this issue by returning immediately. Signed-off-by: Lennart Schulte Signed-off-by: Arnd Hannemann --- net/ipv4/tcp_input.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 788851c..c096a42 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2511,6 +2511,9 @@ static void tcp_mark_head_lost(struct sock *sk, int packets) int err; unsigned int mss; + if (packets == 0) + return; + WARN_ON(packets > tp->packets_out); if (tp->lost_skb_hint) { skb = tp->lost_skb_hint;