diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-03 00:52:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-05 04:04:01 -0400 |
commit | f894cbf847c9bea1955095bf37aca6c050553167 (patch) | |
tree | 9cc63b36c2d299bba95ea90213f4a9ef0ae433d6 /net/decnet | |
parent | 5110effee8fde2edfacac9cd12a9960ab2dc39ea (diff) |
net: Add optional SKB arg to dst_ops->neigh_lookup().
Causes the handler to use the daddr in the ipv4/ipv6 header when
the route gateway is unspecified (local subnet).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_route.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 2493ed5bfecd..60e4c6e1bac0 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -117,7 +117,9 @@ static void dn_dst_destroy(struct dst_entry *); | |||
117 | static struct dst_entry *dn_dst_negative_advice(struct dst_entry *); | 117 | static struct dst_entry *dn_dst_negative_advice(struct dst_entry *); |
118 | static void dn_dst_link_failure(struct sk_buff *); | 118 | static void dn_dst_link_failure(struct sk_buff *); |
119 | static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu); | 119 | static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu); |
120 | static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, const void *daddr); | 120 | static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, |
121 | struct sk_buff *skb, | ||
122 | const void *daddr); | ||
121 | static int dn_route_input(struct sk_buff *); | 123 | static int dn_route_input(struct sk_buff *); |
122 | static void dn_run_flush(unsigned long dummy); | 124 | static void dn_run_flush(unsigned long dummy); |
123 | 125 | ||
@@ -828,7 +830,9 @@ static unsigned int dn_dst_mtu(const struct dst_entry *dst) | |||
828 | return mtu ? : dst->dev->mtu; | 830 | return mtu ? : dst->dev->mtu; |
829 | } | 831 | } |
830 | 832 | ||
831 | static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, const void *daddr) | 833 | static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, |
834 | struct sk_buff *skb, | ||
835 | const void *daddr) | ||
832 | { | 836 | { |
833 | return __neigh_lookup_errno(&dn_neigh_table, daddr, dst->dev); | 837 | return __neigh_lookup_errno(&dn_neigh_table, daddr, dst->dev); |
834 | } | 838 | } |