diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-14 08:34:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 01:53:37 +0300 |
| commit | 352e512c32b634768303a43768245a0363cebbe7 (patch) | |
| tree | 97509ac130ecbe2084808271ccc459918a9d5fc1 /net/decnet | |
| parent | b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b (diff) | |
| download | linux-352e512c32b634768303a43768245a0363cebbe7.tar.xz | |
[NET]: Eliminate duplicate copies of dst_discard
We have a number of copies of dst_discard scattered around the place
which all do the same thing, namely free a packet on the input or
output paths.
This patch deletes all of them except dst_discard and points all the
users to it.
The only non-trivial bit is decnet where it returns an error.
However, conceptually this is identical to the blackhole functions
used in IPv4 and IPv6 which do not return errors. So they should
either all return errors or all return zero. For now I've stuck with
the majority and picked zero as the return value.
It doesn't really matter in practice since few if any driver would
react differently depending on a zero return value or NET_RX_DROP.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/dn_route.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 23aa3556e56f..2a5bb0714c7e 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -765,17 +765,6 @@ drop: } /* - * Drop packet. This is used for endnodes and for - * when we should not be forwarding packets from - * this dest. - */ -static int dn_blackhole(struct sk_buff *skb) -{ - kfree_skb(skb); - return NET_RX_DROP; -} - -/* * Used to catch bugs. This should never normally get * called. */ @@ -1396,7 +1385,7 @@ make_route: default: case RTN_UNREACHABLE: case RTN_BLACKHOLE: - rt->u.dst.input = dn_blackhole; + rt->u.dst.input = dst_discard; } rt->rt_flags = flags; if (rt->u.dst.dev) |