Module Name: src
Committed By: ozaki-r
Date: Fri Jul 8 06:18:29 UTC 2016
Modified Files:
src/sys/netinet6: in6.c
Log Message:
CID 1363345: remove unreachable code and cleanup returns
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.207 src/sys/netinet6/in6.c:1.208
--- src/sys/netinet6/in6.c:1.207 Thu Jul 7 09:32:03 2016
+++ src/sys/netinet6/in6.c Fri Jul 8 06:18:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.207 2016/07/07 09:32:03 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.208 2016/07/08 06:18:29 ozaki-r Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.207 2016/07/07 09:32:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.208 2016/07/08 06:18:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1283,19 +1283,11 @@ in6_update_ifa1(struct ifnet *ifp, struc
nd6_dad_start(&ia->ia_ifa, dad_delay + 1);
}
- return error;
-
- /*
- * XXX: if a change of an existing address failed, keep the entry
- * anyway.
- */
- if (hostIsNew)
- in6_unlink_ifa(ia, ifp);
- exit:
- return error;
+ return 0;
cleanup:
in6_purgeaddr(&ia->ia_ifa);
+ exit:
return error;
}
