diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-02 21:52:24 -0700 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 01:04:01 -0700 | 
| commit | f894cbf847c9bea1955095bf37aca6c050553167 (patch) | |
| tree | 9cc63b36c2d299bba95ea90213f4a9ef0ae433d6 /net/xfrm/xfrm_policy.c | |
| parent | 5110effee8fde2edfacac9cd12a9960ab2dc39ea (diff) | |
| download | olio-linux-3.10-f894cbf847c9bea1955095bf37aca6c050553167.tar.xz olio-linux-3.10-f894cbf847c9bea1955095bf37aca6c050553167.zip  | |
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/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index ccfbd328a69..a28a3f972d5 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -2404,9 +2404,11 @@ static unsigned int xfrm_mtu(const struct dst_entry *dst)  	return mtu ? : dst_mtu(dst->path);  } -static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst, const void *daddr) +static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst, +					   struct sk_buff *skb, +					   const void *daddr)  { -	return dst_neigh_lookup(dst->path, daddr); +	return dst->path->ops->neigh_lookup(dst, skb, daddr);  }  int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)  |