All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rankle_ <crquan@gmail.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [git patch] since the definition of dst_discard_in and dst_discard_out are the same,,they should merged into one
Date: Thu, 31 May 2007 15:26:54 +0800	[thread overview]
Message-ID: <465E78BE.6010807@gmail.com> (raw)

 From 30d6996860f7e5589d1bce10404bbcfd6592c9de Mon Sep 17 00:00:00 2001
From: Denis Cheng <crquan@gmail.com>
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

Signed-off-by: Denis Cheng <crquan@gmail.com>

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);

             reply	other threads:[~2007-05-31  7:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-31  7:26 Rankle_ [this message]
2007-05-31  8:37 ` [git patch] since the definition of dst_discard_in and dst_discard_out are the same,,they should merged into one David Miller
2007-05-31  9:27   ` rae l

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=465E78BE.6010807@gmail.com \
    --to=crquan@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.