Module Name: src
Committed By: ozaki-r
Date: Fri Nov 10 07:15:32 UTC 2017
Modified Files:
src/sys/netinet: in.c
src/sys/netinet6: in6.c
Log Message:
Remove redundant KASSERTMSG
The function is static, has just one caller and the caller does the same check.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/netinet/in.c
cvs rdiff -u -r1.248 -r1.249 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/in.c
diff -u src/sys/netinet/in.c:1.207 src/sys/netinet/in.c:1.208
--- src/sys/netinet/in.c:1.207 Thu Aug 10 04:31:58 2017
+++ src/sys/netinet/in.c Fri Nov 10 07:15:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.207 2017/08/10 04:31:58 ryo Exp $ */
+/* $NetBSD: in.c,v 1.208 2017/11/10 07:15:32 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.207 2017/08/10 04:31:58 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.208 2017/11/10 07:15:32 ozaki-r Exp $");
#include "arp.h"
@@ -1980,9 +1980,6 @@ in_lltable_rtcheck(struct ifnet *ifp, u_
struct rtentry *rt;
int error = EINVAL;
- KASSERTMSG(l3addr->sa_family == AF_INET,
- "sin_family %d", l3addr->sa_family);
-
rt = rtalloc1(l3addr, 0);
if (rt == NULL)
return error;
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.248 src/sys/netinet6/in6.c:1.249
--- src/sys/netinet6/in6.c:1.248 Thu Jun 22 09:53:25 2017
+++ src/sys/netinet6/in6.c Fri Nov 10 07:15:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.248 2017/06/22 09:53:25 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.249 2017/11/10 07:15:32 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.248 2017/06/22 09:53:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.249 2017/11/10 07:15:32 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2465,9 +2465,6 @@ in6_lltable_rtcheck(struct ifnet *ifp,
struct rtentry *rt;
char ip6buf[INET6_ADDRSTRLEN];
- KASSERTMSG(l3addr->sa_family == AF_INET6,
- "sin_family %d", l3addr->sa_family);
-
rt = rtalloc1(l3addr, 0);
if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || rt->rt_ifp != ifp) {
int s;
