2007-05-28 02:41:31

by cheng renquan

Subject: [PATCH] merge dst_discard in & out into one, this decrements the vmlinux image by 21 bytes under i386 arch.

From: Denis Cheng

thus the definition of dst_discard_in and dst_discard_out is the same,
we can define a dst_discard function and map the _in and _out to it,
this can reduce space in vmlinux.

Signed-off-by: Denis Cheng <[email protected]>
---

diff --git a/net/core/dst.c b/net/core/dst.c
index 764bccb..daa0439 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -111,17 +111,14 @@ out:
spin_unlock(&dst_lock);
}

-static int dst_discard_in(struct sk_buff *skb)
+static int dst_discard(struct sk_buff *skb)
{
kfree_skb(skb);
return 0;
}

-static int dst_discard_out(struct sk_buff *skb)
-{
- kfree_skb(skb);
- return 0;
-}
+#define dst_discard_in dst_discard
+#define dst_discard_out dst_discard

void * dst_alloc(struct dst_ops * ops)
{


--
Denis Cheng
Linux Application Developer

2007-05-28 09:53:20

by Jan Engelhardt

Subject: Re: [PATCH] merge dst_discard in & out into one, this decrements the vmlinux image by 21 bytes under i386 arch.

On May 28 2007 10:41, rae l wrote:
>
> diff --git a/net/core/dst.c b/net/core/dst.c
> index 764bccb..daa0439 100644
> --- a/net/core/dst.c
> +++ b/net/core/dst.c
> @@ -111,17 +111,14 @@ out:
> spin_unlock(&dst_lock);
> }
>
> -static int dst_discard_in(struct sk_buff *skb)
> +static int dst_discard(struct sk_buff *skb)
> {
> kfree_skb(skb);
> return 0;
> }
>
> -static int dst_discard_out(struct sk_buff *skb)
> -{
> - kfree_skb(skb);
> - return 0;
> -}
> +#define dst_discard_in dst_discard
> +#define dst_discard_out dst_discard

Uhm, just replace every invocation of dst_discard_in/_out() directly
by dst_discard ... don't add macros for that.


>
> void * dst_alloc(struct dst_ops * ops)
> {
>
>

Jan
--

2007-05-28 10:35:28

by cheng renquan

Subject: [PATCH] merge dst_discard in & out into one, this decrements the vmlinux image by 21 bytes under i386 arch.

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.
so that, the trival patch changed to this:

because the definition of dst_discard_in and dst_discard_out are the
same, so they merged into one.

Signed-off-by: Denis Cheng <[email protected]>
---

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