diff options
| author | David S. Miller | 2016-04-27 15:43:10 -0400 |
|---|---|---|
| committer | David S. Miller | 2016-04-27 15:43:10 -0400 |
| commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch) | |
| tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 /net/ipv4 | |
| parent | 8c14586fc320acfed8a0048eb21d1f2e2856fc36 (diff) | |
| parent | f28f20da704d399fb1e4d8838ffd697a357d9cc8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.
In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 8a9246deccfe..63566ec54794 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim) if (ifa->ifa_flags & IFA_F_SECONDARY) { prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask); if (!prim) { - pr_warn("%s: bug: prim == NULL\n", __func__); + /* if the device has been deleted, we don't perform + * address promotion + */ + if (!in_dev->dead) + pr_warn("%s: bug: prim == NULL\n", __func__); return; } if (iprim && iprim != prim) { |