Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Reduce the diff between similar blocks.
details: https://anonhg.NetBSD.org/src/rev/7962fef0734f
branches: trunk
changeset: 322003:7962fef0734f
user: maxv <maxv%NetBSD.org@localhost>
date: Fri Apr 13 08:47:46 2018 +0000
description:
Reduce the diff between similar blocks.
diffstat:
sys/netinet/ip_output.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (41 lines):
diff -r 15a6abe9e092 -r 7962fef0734f sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c Fri Apr 13 08:44:41 2018 +0000
+++ b/sys/netinet/ip_output.c Fri Apr 13 08:47:46 2018 +0000
@@ -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 @@
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 @@
error = ip6_get_membership(sopt, &ifp, &psref, &ia, sizeof(ia));
#else
error = EINVAL;
- goto out;
#endif
}
Home |
Main Index |
Thread Index |
Old Index