projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
fib_frontend.c
diff --git
a/net/ipv4/fib_frontend.c
b/net/ipv4/fib_frontend.c
index f97ae9d93ee9c302245dc9a01a1c0bdff24269f7..98c754e61024e14f46e6112d6e1a90fb88a013f0 100644
(file)
--- a/
net/ipv4/fib_frontend.c
+++ b/
net/ipv4/fib_frontend.c
@@
-905,7
+905,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) {
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) {
return;
}
if (iprim && iprim != prim) {