From c1b43b0f2d28f6c103d1170cf064a86d6e4fd26c Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 14 Oct 2007 02:26:10 +0000 Subject: 2007-10-14 Stefan Siegl * options.c (ipv6_get_dflt_router) [CONFIG_IPV6]: New function. (parse_opt) [CONFIG_IPV6]: Don't delete IPv6 interface address, if it would be re-added immediately, but delete if otherwise. Do not touch inet6_ifaddr after inet6_addr_del was called. Don't purge and re-add IPv6 default router unless necessary. (trivfs_append_args) [CONFIG_IPV6]: Use ipv6_get_dflt_router. * linux-src/net/ipv6/addrconf.c (ipv6_del_addr): Call del_timer on ifp->timer. --- pfinet/linux-src/net/ipv6/addrconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pfinet/linux-src') diff --git a/pfinet/linux-src/net/ipv6/addrconf.c b/pfinet/linux-src/net/ipv6/addrconf.c index 7fbf4061..e72c382c 100644 --- a/pfinet/linux-src/net/ipv6/addrconf.c +++ b/pfinet/linux-src/net/ipv6/addrconf.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque * - * $Id: addrconf.c,v 1.2 2007/10/08 21:59:10 stesie Exp $ + * $Id: addrconf.c,v 1.3 2007/10/14 02:26:10 stesie Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -367,6 +367,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) } ipv6_ifa_notify(RTM_DELADDR, ifp); + del_timer(&ifp->timer); kfree(ifp); } -- cgit v1.2.3