* [PATCH] since the definition of dst_discard_in and dst_discard_out are the same,
@ 2007-06-02 2:08 Denis Cheng
2007-06-03 3:11 ` rae l
2007-06-05 7:07 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Denis Cheng @ 2007-06-02 2:08 UTC (permalink / raw)
To: Andrew Morton; +Cc: netdev, linux-kernel, trivial
they should merged into one
Signed-off-by: Denis Cheng <crquan@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] since the definition of dst_discard_in and dst_discard_out are the same,
2007-06-02 2:08 [PATCH] since the definition of dst_discard_in and dst_discard_out are the same, Denis Cheng
@ 2007-06-03 3:11 ` rae l
2007-06-05 7:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: rae l @ 2007-06-03 3:11 UTC (permalink / raw)
To: Andrew Morton; +Cc: netdev, linux-kernel, trivial
On 6/2/07, Denis Cheng <crquan@gmail.com> 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 <crquan@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] since the definition of dst_discard_in and dst_discard_out are the same,
2007-06-02 2:08 [PATCH] since the definition of dst_discard_in and dst_discard_out are the same, Denis Cheng
2007-06-03 3:11 ` rae l
@ 2007-06-05 7:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2007-06-05 7:07 UTC (permalink / raw)
To: crquan; +Cc: akpm, netdev, linux-kernel, trivial
From: Denis Cheng <crquan@gmail.com>
Date: Fri, 01 Jun 2007 19:08:51 -0700 (PDT)
> they should merged into one
>
> Signed-off-by: Denis Cheng <crquan@gmail.com>
Patch applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-06-05 7:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-02 2:08 [PATCH] since the definition of dst_discard_in and dst_discard_out are the same, Denis Cheng
2007-06-03 3:11 ` rae l
2007-06-05 7:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).