Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Fix build of kernel with SCTP
details: https://anonhg.NetBSD.org/src/rev/790e84583698
branches: trunk
changeset: 353103:790e84583698
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Thu Apr 20 09:19:19 2017 +0000
description:
Fix build of kernel with SCTP
diffstat:
sys/netinet/sctp_input.c | 6 +++---
sys/netinet6/sctp6_usrreq.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (56 lines):
diff -r 9850129faa0a -r 790e84583698 sys/netinet/sctp_input.c
--- a/sys/netinet/sctp_input.c Thu Apr 20 09:18:05 2017 +0000
+++ b/sys/netinet/sctp_input.c Thu Apr 20 09:19:19 2017 +0000
@@ -1,5 +1,5 @@
/* $KAME: sctp_input.c,v 1.28 2005/04/21 18:36:21 nishida Exp $ */
-/* $NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $ */
+/* $NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $ */
/*
* Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -4237,7 +4237,7 @@
* I very much doubt any of the IPSEC stuff will work but I have
* no idea, so I will leave it in place.
*/
- if (ipsec_used && ipsec4_in_reject(m, inp)) {
+ if (ipsec_used && ipsec4_in_reject(m, (struct inpcb *)inp)) {
#if 0
ipsecstat.in_polvio++;
#endif
diff -r 9850129faa0a -r 790e84583698 sys/netinet6/sctp6_usrreq.c
--- a/sys/netinet6/sctp6_usrreq.c Thu Apr 20 09:18:05 2017 +0000
+++ b/sys/netinet6/sctp6_usrreq.c Thu Apr 20 09:19:19 2017 +0000
@@ -1,5 +1,5 @@
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -235,7 +235,7 @@
/*
* Check AH/ESP integrity.
*/
- if (ipsec_used && ipsec6_in_reject(m, in6p)) {
+ if (ipsec_used && ipsec6_in_reject(m, (struct in6pcb *)in6p_ip)) {
/* XXX */
#if 0
/* FIX ME: need to find right stat */
Home |
Main Index |
Thread Index |
Old Index