Module Name: src
Committed By: mrg
Date: Tue Feb 5 04:48:47 UTC 2019
Modified Files:
src/sys/netinet: tcp_usrreq.c
src/sys/netinet6: in6.c
Log Message:
adjust fallthru comments to appease gcc7.
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.272 -r1.273 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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.223 src/sys/netinet/tcp_usrreq.c:1.224
--- src/sys/netinet/tcp_usrreq.c:1.223 Mon Jan 28 12:53:01 2019
+++ src/sys/netinet/tcp_usrreq.c Tue Feb 5 04:48:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.223 2019/01/28 12:53:01 martin Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.223 2019/01/28 12:53:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1689,8 +1689,8 @@ sysctl_net_inet_tcp_ident(SYSCTLFN_ARGS)
in6_sin6_2_sin_in_sock((struct sockaddr *)&sa[0]);
in6_sin6_2_sin_in_sock((struct sockaddr *)&sa[1]);
- /*FALLTHROUGH*/
#endif /* INET6 */
+ /*FALLTHROUGH*/
case PF_INET:
si4[0] = (struct sockaddr_in*)&sa[0];
si4[1] = (struct sockaddr_in*)&sa[1];
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.272 src/sys/netinet6/in6.c:1.273
--- src/sys/netinet6/in6.c:1.272 Thu Nov 29 09:54:23 2018
+++ src/sys/netinet6/in6.c Tue Feb 5 04:48:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.272 2018/11/29 09:54:23 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.273 2019/02/05 04:48:47 mrg 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.272 2018/11/29 09:54:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.273 2019/02/05 04:48:47 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -531,10 +531,11 @@ in6_control1(struct socket *so, u_long c
error = EADDRNOTAVAIL;
goto out;
}
- /* FALLTHROUGH */
#ifdef OSIOCAIFADDR_IN6
+ /* FALLTHROUGH */
case OSIOCAIFADDR_IN6:
#endif
+ /* FALLTHROUGH */
case SIOCAIFADDR_IN6:
/*
* We always require users to specify a valid IPv6 address for
@@ -674,8 +675,8 @@ in6_control1(struct socket *so, u_long c
#ifdef OSIOCAIFADDR_IN6
case OSIOCAIFADDR_IN6:
in6_aliasreq50_to_in6_aliasreq(ifra);
- /*FALLTHROUGH*/
#endif
+ /*FALLTHROUGH*/
case SIOCAIFADDR_IN6:
{
struct in6_addrlifetime *lt;
