diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-13 14:03:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-20 22:31:20 +0200 |
| commit | f8126f1d5136be1ca1a3536d43ad7a710b5620f8 (patch) | |
| tree | 8a92815052257c4ca29461f5b9ddaaeac288a7ed /net/ipv4/arp.c | |
| parent | ipv4: Remove 'rt_dst' from 'struct rtable' (diff) | |
| download | linux-f8126f1d5136be1ca1a3536d43ad7a710b5620f8.tar.xz linux-f8126f1d5136be1ca1a3536d43ad7a710b5620f8.zip | |
ipv4: Adjust semantics of rt->rt_gateway.
In order to allow prefixed routes, we have to adjust how rt_gateway
is set and interpreted.
The new interpretation is:
1) rt_gateway == 0, destination is on-link, nexthop is iph->daddr
2) rt_gateway != 0, destination requires a nexthop gateway
Abstract the fetching of the proper nexthop value using a new
inline helper, rt_nexthop(), as suggested by Joe Perches.
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Vijay Subramanian <subramanian.vijay@gmail.com>
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index c38293f38161..a0124eb7dbea 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -475,8 +475,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb) return 1; } - paddr = skb_rtable(skb)->rt_gateway; - + paddr = rt_nexthop(skb_rtable(skb), ip_hdr(skb)->daddr); if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr, paddr, dev)) return 0; |