Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763988AbXFCDL7 (ORCPT ); Sat, 2 Jun 2007 23:11:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763160AbXFCDLt (ORCPT ); Sat, 2 Jun 2007 23:11:49 -0400 Received: from nf-out-0910.google.com ([64.233.182.185]:7415 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761670AbXFCDLs (ORCPT ); Sat, 2 Jun 2007 23:11:48 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=PDwgho5svntyO/+/1KMv4ju8dffgnNvHPUroQ+uf4mECVqshoXU7amZZFcbcWUGF6TINa5hXbiD2glQXgffNhLzuo0aRKa2Y73dgxwuoJ7b4YEGpyoqU1tbmFSI5dqdHB57YMp83INijJIm4cGH9UvQIErtEzeJPCepsqP19TNI= Message-ID: <91b13c310706022011tb3fd221x53e47c92fa69fb62@mail.gmail.com> Date: Sun, 3 Jun 2007 11:11:46 +0800 From: "rae l" To: "Andrew Morton" Subject: Re: [PATCH] since the definition of dst_discard_in and dst_discard_out are the same, Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, trivial@kernel.org In-Reply-To: <4660d133.4d65d79b.64d5.72fc@mx.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <4660d133.4d65d79b.64d5.72fc@mx.google.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2245 Lines: 74 On 6/2/07, Denis Cheng wrote: > they should merged into one this patch I have checked, it's not corrupted, I wonder someone can give some comment on this? > > Signed-off-by: Denis Cheng > --- > net/core/dst.c | 17 ++++------------- > 1 files changed, 4 insertions(+), 13 deletions(-) > > diff --git a/net/core/dst.c b/net/core/dst.c > index 764bccb..c6a0587 100644 > --- a/net/core/dst.c > +++ b/net/core/dst.c > @@ -111,13 +111,7 @@ out: > spin_unlock(&dst_lock); > } > > -static int dst_discard_in(struct sk_buff *skb) > -{ > - kfree_skb(skb); > - return 0; > -} > - > -static int dst_discard_out(struct sk_buff *skb) > +static int dst_discard(struct sk_buff *skb) > { > kfree_skb(skb); > return 0; > @@ -138,8 +132,7 @@ void * dst_alloc(struct dst_ops * ops) > dst->ops = ops; > dst->lastuse = jiffies; > dst->path = dst; > - dst->input = dst_discard_in; > - dst->output = dst_discard_out; > + dst->input = dst->output = dst_discard; > #if RT_CACHE_DEBUG >= 2 > atomic_inc(&dst_total); > #endif > @@ -153,8 +146,7 @@ static void ___dst_free(struct dst_entry * dst) > protocol module is unloaded. > */ > if (dst->dev == NULL || !(dst->dev->flags&IFF_UP)) { > - dst->input = dst_discard_in; > - dst->output = dst_discard_out; > + dst->input = dst->output = dst_discard; > } > dst->obsolete = 2; > } > @@ -242,8 +234,7 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev, > return; > > if (!unregister) { > - dst->input = dst_discard_in; > - dst->output = dst_discard_out; > + dst->input = dst->output = dst_discard; > } else { > dst->dev = &loopback_dev; > dev_hold(&loopback_dev); > -- > 1.4.4.2 > > -- Denis Cheng Linux Application Developer - 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/