diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-04-05 16:30:37 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-08 15:22:41 -0700 |
| commit | 619d1826269b4be5c992bec0029bbfcc823d663d (patch) | |
| tree | bc6d09a2b0b36e1df60da7164e357c2d06d6c348 /net/ipv4/fib_semantics.c | |
| parent | ipv4: Handle ipv6 gateway in ipv4_confirm_neigh (diff) | |
| download | linux-dev-619d1826269b4be5c992bec0029bbfcc823d663d.tar.xz linux-dev-619d1826269b4be5c992bec0029bbfcc823d663d.zip | |
ipv4: Handle ipv6 gateway in fib_detect_death
Update fib_detect_death to handle an ipv6 gateway.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index dd95725c318e..e5a6d431bfab 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -457,10 +457,18 @@ static int fib_detect_death(struct fib_info *fi, int order, struct fib_info **last_resort, int *last_idx, int dflt) { + const struct fib_nh_common *nhc = fib_info_nhc(fi, 0); struct neighbour *n; int state = NUD_NONE; - n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].fib_nh_gw4, fi->fib_dev); + if (likely(nhc->nhc_gw_family == AF_INET)) + n = neigh_lookup(&arp_tbl, &nhc->nhc_gw.ipv4, nhc->nhc_dev); + else if (nhc->nhc_gw_family == AF_INET6) + n = neigh_lookup(ipv6_stub->nd_tbl, &nhc->nhc_gw.ipv6, + nhc->nhc_dev); + else + n = NULL; + if (n) { state = n->nud_state; neigh_release(n); |