Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S268904AbUINEzp (ORCPT ); Tue, 14 Sep 2004 00:55:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268937AbUINEzp (ORCPT ); Tue, 14 Sep 2004 00:55:45 -0400 Received: from adsl-63-197-226-105.dsl.snfc21.pacbell.net ([63.197.226.105]:22186 "EHLO cheetah.davemloft.net") by vger.kernel.org with ESMTP id S268904AbUINEzn (ORCPT ); Tue, 14 Sep 2004 00:55:43 -0400 Date: Mon, 13 Sep 2004 21:53:35 -0700 From: "David S. Miller" To: Herbert Xu Cc: jmorris@redhat.com, akpm@osdl.org, linux-kernel@vger.kernel.org, netdev@oss.sgi.com Subject: Re: 2.6.9-rc1-mm5: TCP oopses Message-Id: <20040913215335.64508d55.davem@davemloft.net> In-Reply-To: References: <20040913190858.12544431.davem@davemloft.net> X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu) X-Face: "_;p5u5aPsO,_Vsx"^v-pEq09'CU4&Dc1$fQExov$62l60cgCc%FnIwD=.UF^a>?5'9Kn[;433QFVV9M..2eN.@4ZWPGbdi<=?[:T>y?SD(R*-3It"Vj:)"dP Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1144 Lines: 30 On Tue, 14 Sep 2004 13:34:20 +1000 Herbert Xu wrote: > > @@ -968,11 +972,17 @@ > > return -EAGAIN; > > > > if (skb->len > cur_mss) { > > + int old_factor = TCP_SKB_CB(skb)->tso_factor; > > + int new_factor; > > + > > if (tcp_fragment(sk, skb, cur_mss)) > > return -ENOMEM; /* We'll try again later. */ > > > > /* New SKB created, account for it. */ > > - tcp_inc_pcount(&tp->packets_out, skb); > > + new_factor = TCP_SKB_CB(skb)->tso_factor; > > + tcp_dec_pcount_explicit(&tp->packets_out, > > + new_factor - old_factor); > > That should be tcp_inc_pcount_explicit. Better fix is to transpose the factors in the subtraction. That's what I was trying to do here. Good eyes Herbert. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/