Commit 391a2033 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

ipv4/fib: don't warn when primary address is missing if in_dev is dead

After commit fbd40ea0 ("ipv4: Don't do expensive useless work
during inetdev destroy.") when deleting an interface,
fib_del_ifaddr() can be executed without any primary address
present on the dead interface.

The above is safe, but triggers some "bug: prim == NULL" warnings.

This commit avoids warning if the in_dev is dead
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91e019de
...@@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim) ...@@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
if (ifa->ifa_flags & IFA_F_SECONDARY) { if (ifa->ifa_flags & IFA_F_SECONDARY) {
prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask); prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
if (!prim) { 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; return;
} }
if (iprim && iprim != prim) { if (iprim && iprim != prim) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment