Skip to content

Commit

Permalink
[NET]: Merge dst_discard_in and dst_discard_out.
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis Cheng authored and David S. Miller committed Jun 7, 2007
1 parent c36befb commit c4b1010
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions net/core/dst.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,7 @@ static void dst_run_gc(unsigned long dummy)
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;
Expand All @@ -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
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c4b1010

Please sign in to comment.