netdev - [git patch] since the definition of dst_discard_in and dst_discard_out are the same,,they should merged into one

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <465E78BE.6010807@gmail.com>
Date:	Thu, 31 May 2007 15:26:54 +0800
From:	Rankle_ <crquan@...il.com>
To:	netdev@...r.kernel.org
CC:	linux-kernel@...r.kernel.org
Subject: [git patch] 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 <crquan@...il.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@...il.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);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html