diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
| commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
| tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /net/core/neighbour.c | |
| parent | d92060bc69233a8175a0c2bfa0d2bce123cace2d (diff) | |
| parent | 23469de647c4c7b68b5d135927b1c509f0e757e6 (diff) | |
| download | linux-21ea1d36f6dfcb1d59184937c672022d5d01902a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David Ahern's dump indexing bug fix in 'net' overlapped the change of the function signature of inet6_fill_ifaddr() in 'net-next'. Trivially resolved. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/neighbour.c')
| -rw-r--r-- | net/core/neighbour.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 69c41cb3966d..ee605d9d8bd4 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1167,8 +1167,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, neigh->nud_state = new; err = 0; notify = old & NUD_VALID; - if (((old & (NUD_INCOMPLETE | NUD_PROBE)) || - (flags & NEIGH_UPDATE_F_ADMIN)) && + if ((old & (NUD_INCOMPLETE | NUD_PROBE)) && (new & NUD_FAILED)) { neigh_invalidate(neigh); notify = 1; |