Module Name: src
Committed By: maxv
Date: Fri Apr 13 08:47:46 UTC 2018
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
Reduce the diff between similar blocks.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.300 src/sys/netinet/ip_output.c:1.301
--- src/sys/netinet/ip_output.c:1.300 Fri Apr 13 08:12:51 2018
+++ src/sys/netinet/ip_output.c Fri Apr 13 08:47:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.300 2018/04/13 08:12:51 maxv Exp $ */
+/* $NetBSD: ip_output.c,v 1.301 2018/04/13 08:47:46 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.300 2018/04/13 08:12:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.301 2018/04/13 08:47:46 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1822,12 +1822,13 @@ ip_add_membership(struct ip_moptions *im
bound = curlwp_bind();
if (sopt->sopt_size == sizeof(struct ip_mreq))
error = ip_get_membership(sopt, &ifp, &psref, &ia, true);
- else
+ else {
#ifdef INET6
error = ip6_get_membership(sopt, &ifp, &psref, &ia, sizeof(ia));
#else
error = EINVAL;
#endif
+ }
if (error)
goto out;
@@ -1902,7 +1903,6 @@ ip_drop_membership(struct ip_moptions *i
error = ip6_get_membership(sopt, &ifp, &psref, &ia, sizeof(ia));
#else
error = EINVAL;
- goto out;
#endif
}
