Skip to contentSkip to conversation

since the definition of dst_discard_in and dst_discard_out are the same,,they should merged into one

PATCH In review Rankle_ 2 participants 3 messages May 31, 2007

Subsystems (2)
lore
Share & tools
lore

Rankle_

author
#0 lore raw

PATCH 1/1 since the definition of dst_discard_in and dst_discard_out are the same,,they should merged into one

From 30d6996860f7e5589d1bce10404bbcfd6592c9de Mon Sep 17 00:00:00 2001
From: Denis Cheng <[email protected]>
Date: Thu, 31 May 2007 15:21:58 +0800
Subject: [PATCH] since the definition of dst_discard_in and dst_discard_out are the same, they should merged into one

net/core/dst.c +0 -0
index 764bccb..c6a0587 100644
@@ -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);
maintainer
#1 lore raw

From: Rankle_ <[email protected]>
Date: Thu, 31 May 2007 15:26:54 +0800

Quoted 8 lines

From 30d6996860f7e5589d1bce10404bbcfd6592c9de Mon Sep 17 00:00:00 2001
From: Denis Cheng <[email protected]>
Date: Thu, 31 May 2007 15:21:58 +0800
Subject: [PATCH] since the definition of dst_discard_in and dst_discard_out are the same,
they should merged into one

Your email client has changed all of the tab characters into spaces, corrupting the patch.

Please configure your email client to not perform any text formatting.

Please test this, by emailing the patch to yourself and trying to apply it, before resending.

Thank you.

author
#2 lore raw
Quoted 10 lines · David Miller

Your email client has changed all of the tab characters into spaces, corrupting the patch.

Please configure your email client to not perform any text formatting.

Please test this, by emailing the patch to yourself and trying to apply it, before resending.

Thank you.

Oh, as this, I'll try. A lot of thanks.

Quoted 1 line
Signature · 1 line
Denis Cheng