Received: with ECARTIS (v1.0.0; list netdev); Thu, 19 May 2005 14:49:37 -0700 (PDT) Received: from arnor.apana.org.au (arnor.apana.org.au [203.14.152.115]) by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id j4JLnTF3004784 for ; Thu, 19 May 2005 14:49:30 -0700 Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail) by arnor.apana.org.au with esmtp (Exim 3.35 #1 (Debian)) id 1DYssj-0007xd-00; Fri, 20 May 2005 07:48:41 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian)) id 1DYssg-0006Km-00; Fri, 20 May 2005 07:48:38 +1000 Date: Fri, 20 May 2005 07:48:38 +1000 To: "David S. Miller" Cc: johnpol@2ka.mipt.ru, netdev@oss.sgi.com Subject: Re: [IPV4/IPV6] Keep wmem accounting separate in ip*_push_pending_frames Message-ID: <20050519214838.GD24024@gondor.apana.org.au> References: <20050515235913.GA20242@gondor.apana.org.au> <20050515.173944.122590923.davem@davemloft.net> <20050516010058.GA20704@gondor.apana.org.au> <20050519.123530.55508893.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050519.123530.55508893.davem@davemloft.net> User-Agent: Mutt/1.5.6+20040907i From: Herbert Xu X-archive-position: 1407 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: herbert@gondor.apana.org.au Precedence: bulk X-list: netdev Content-Length: 1496 Lines: 59 On Thu, May 19, 2005 at 12:35:30PM -0700, David S. Miller wrote: > > Ok, based upon this I am adding the following patch to my > tree. Thanks. Thanks Dave, this looks good to me. > --- 1/net/ipv4/netfilter/ip_conntrack_core.c.~1~ 2005-05-18 22:45:26.000000000 -0700 > +++ 2/net/ipv4/netfilter/ip_conntrack_core.c 2005-05-19 12:32:26.000000000 -0700 > @@ -940,37 +940,25 @@ > struct sk_buff * > ip_ct_gather_frags(struct sk_buff *skb, u_int32_t user) > { > - struct sock *sk = skb->sk; > #ifdef CONFIG_NETFILTER_DEBUG > unsigned int olddebug = skb->nf_debug; > #endif > > - if (sk) { > - sock_hold(sk); > - skb_orphan(skb); > - } > + skb_orphan(skb); > > local_bh_disable(); > skb = ip_defrag(skb, user); > local_bh_enable(); > > - if (!skb) { > - if (sk) > - sock_put(sk); > - return skb; > - } > - > - if (sk) { > - skb_set_owner_w(skb, sk); > - sock_put(sk); > - } > - > - ip_send_check(skb->nh.iph); > - skb->nfcache |= NFC_ALTERED; > + if (skb) { > + ip_send_check(skb->nh.iph); > + skb->nfcache |= NFC_ALTERED; > #ifdef CONFIG_NETFILTER_DEBUG > - /* Packet path as if nothing had happened. */ > - skb->nf_debug = olddebug; > + /* Packet path as if nothing had happened. */ > + skb->nf_debug = olddebug; > #endif > + } > + > return skb; > } -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt