From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 8 Jun 2007 01:35:38 +0000 (-0700)
Subject: [IPV4]: Do not remove idev when addresses are cleared
X-Git-Tag: v2.6.22-rc5~58^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6363097cc4d182f93788131b5d8f72aa91d950a0;p=linux-2.6

[IPV4]: Do not remove idev when addresses are cleared

Now that we create idev before addresses are added, it no longer makes
sense to remove them when addresses are all deleted.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index fa97b96a3d..abf6352f99 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -327,12 +327,8 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
 		}
 
 	}
-	if (destroy) {
+	if (destroy)
 		inet_free_ifa(ifa1);
-
-		if (!in_dev->ifa_list)
-			inetdev_destroy(in_dev);
-	}
 }
 
 static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,