summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu2007-06-08 03:35:38 +0200
committerDavid S. Miller2007-06-08 22:33:08 +0200
commit6363097cc4d182f93788131b5d8f72aa91d950a0 (patch)
treea90b11cc948ce3dcb48bd14f82c0776cf25e8eaf /net
parentRAMFS NOMMU: missed POSIX UID/GID inode attribute checking (diff)
downloadkernel-qcow2-linux-6363097cc4d182f93788131b5d8f72aa91d950a0.tar.gz
kernel-qcow2-linux-6363097cc4d182f93788131b5d8f72aa91d950a0.tar.xz
kernel-qcow2-linux-6363097cc4d182f93788131b5d8f72aa91d950a0.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/devinet.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index fa97b96a3d89..abf6352f990f 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,