On 5/28/07, Jan Engelhardt <[EMAIL PROTECTED]> wrote:
Uhm, just replace every invocation of dst_discard_in/_out() directly by dst_discard ... don't add macros for that.
merge dst_discard in & out into one, this removed a duplicate function. Signed-off-by: Denis Cheng <[EMAIL PROTECTED]> --- Is there anybody also found this duplicate? I found this duplcate had existed from linux-2.2 linux-2.4 to the latest kernel tree, you could check it in the lxr site conveniently: http://lxr.linux.no/source/net/core/dst.c?v=2.2.26 http://lxr.linux.no/source/net/core/dst.c?v=2.4.18 http://lxr.linux.no/source/net/core/dst.c With little difference, the 2.2 and 2.4 version use two different function name: dst_discard and dst_blackhole, but the definition of them are the same, so they are same substantially. Additionally, the two same function are two local(static) functions in a single file dst.c, I don't know why there should exist two same functions. I wonder what the consideration of this design is, because I'm just a kernel newbie; this problem has been confusing me for many days, so if you know why, please drop me some directions. 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); -- Denis Cheng Linux Application Developer - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
