diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-04 19:16:43 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-06 22:54:22 +0300 |
commit | aaa4e70404c7b38a8792dc69af54afd7218b2ec0 (patch) | |
tree | 97e298abfa74712540b528fb7d7436c10175b1f3 /net/decnet/dn_route.c | |
parent | 616f45416ca0d726d6d3421a296ebc6e2bb82cde (diff) | |
download | linux-aaa4e70404c7b38a8792dc69af54afd7218b2ec0.tar.xz |
DECnet: Only use neigh_ops for adding the link layer header
Other users users of the neighbour table use neigh->output as the method
to decided when and which link-layer header to place on a packet.
DECnet has been using neigh->output to decide which DECnet headers to
place on a packet depending which neighbour the packet is destined for.
The DECnet usage isn't totally wrong but it can run into problems if the
neighbour output function is run for a second time as the teql driver
and the bridge netfilter code can do.
Therefore to avoid pathologic problems later down the line and make the
neighbour code easier to understand by refactoring the decnet output
code to only use a neighbour method to add a link layer header to a
packet.
This is done by moving the neigbhour operations lookup from
dn_to_neigh_output to dn_neigh_output_packet.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_route.c')
-rw-r--r-- | net/decnet/dn_route.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 3b81092771f8..771815575dbd 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -743,15 +743,6 @@ out: return NET_RX_DROP; } -static int dn_to_neigh_output(struct sk_buff *skb) -{ - struct dst_entry *dst = skb_dst(skb); - struct dn_route *rt = (struct dn_route *) dst; - struct neighbour *n = rt->n; - - return n->output(n, skb); -} - static int dn_output(struct sock *sk, struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); |