Module Name: src
Committed By: christos
Date: Wed Feb 14 16:45:24 UTC 2018
Modified Files:
src/sys/netinet: raw_ip.c
Log Message:
join lines where they fit.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/netinet/raw_ip.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/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.167 src/sys/netinet/raw_ip.c:1.168
--- src/sys/netinet/raw_ip.c:1.167 Mon Dec 11 00:47:18 2017
+++ src/sys/netinet/raw_ip.c Wed Feb 14 11:45:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.167 2017/12/11 05:47:18 ryo Exp $ */
+/* $NetBSD: raw_ip.c,v 1.168 2018/02/14 16:45:24 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.167 2017/12/11 05:47:18 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.168 2018/02/14 16:45:24 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -204,8 +204,7 @@ rip_input(struct mbuf *m, ...)
;
#if defined(IPSEC)
/* check AH/ESP integrity. */
- else if (ipsec_used &&
- ipsec4_in_reject(m, last)) {
+ else if (ipsec_used && ipsec4_in_reject(m, last)) {
IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
/* do not inject data to pcb */
}
@@ -219,8 +218,7 @@ rip_input(struct mbuf *m, ...)
}
#if defined(IPSEC)
/* check AH/ESP integrity. */
- if (ipsec_used && last != NULL
- && ipsec4_in_reject(m, last)) {
+ if (ipsec_used && last != NULL && ipsec4_in_reject(m, last)) {
m_freem(m);
IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
IP_STATDEC(IP_STAT_DELIVERED);
