From ab8d0af99872e5cf269b9a5792e2832696cfb57f Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Sat, 19 Mar 2011 12:13:54 +0000 Subject: [PATCH] --- yaml --- r: 242610 b: refs/heads/master c: 04024b937a6e9b7d4320b5853557cea3930d528c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/devinet.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cdf3750039e2..5bad10d6f304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d230e2b2c3111cf4a11619f60dcd158ae84e3ab +refs/heads/master: 04024b937a6e9b7d4320b5853557cea3930d528c diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c index 2523001f4c9a..d5a4553bebc3 100644 --- a/trunk/net/ipv4/devinet.c +++ b/trunk/net/ipv4/devinet.c @@ -375,6 +375,7 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, blocking_notifier_call_chain(&inetaddr_chain, NETDEV_DOWN, ifa1); if (promote) { + struct in_ifaddr *next_sec = promote->ifa_next; if (prev_prom) { prev_prom->ifa_next = promote->ifa_next; @@ -386,7 +387,7 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, rtmsg_ifa(RTM_NEWADDR, promote, nlh, pid); blocking_notifier_call_chain(&inetaddr_chain, NETDEV_UP, promote); - for (ifa = promote->ifa_next; ifa; ifa = ifa->ifa_next) { + for (ifa = next_sec; ifa; ifa = ifa->ifa_next) { if (ifa1->ifa_mask != ifa->ifa_mask || !inet_ifa_match(ifa1->ifa_address, ifa)) continue;