diff options
author | Renato Botelho <renato@netgate.com> | 2016-08-08 13:18:31 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-08-08 13:18:31 -0300 |
commit | c481775c0ef4d4d98dd1d53711a00b2e101533d2 (patch) | |
tree | 9590dc3802a31ee0e5931f40e389abe8e2785b78 /sys/netinet6/in6.c | |
parent | 4008e6a2e9bc1ee9983a4cf7d23093d2015026d6 (diff) | |
parent | 89512a096a7717f8c3f2ca6889e0c6b1a1d50b32 (diff) | |
download | FreeBSD-src-c481775c0ef4d4d98dd1d53711a00b2e101533d2.zip FreeBSD-src-c481775c0ef4d4d98dd1d53711a00b2e101533d2.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/netinet6/in6.c')
-rw-r--r-- | sys/netinet6/in6.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index e3c3229..0b49787 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -732,14 +732,6 @@ in6_control(struct socket *so, u_long cmd, caddr_t data, (*carp_detach_p)(&ia->ia_ifa); goto out; } - if (pr == NULL) { - if (carp_attached) - (*carp_detach_p)(&ia->ia_ifa); - log(LOG_ERR, "nd6_prelist_add succeeded but " - "no prefix\n"); - error = EINVAL; - goto out; - } } /* relate the address to the prefix */ |