[src/trunk]: src/sys/netinet join lines where they fit.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/243d4738b16c
branches:  trunk
changeset: 829846:243d4738b16c
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 14 16:45:24 2018 +0000

description:
join lines where they fit.

diffstat:

 sys/netinet/raw_ip.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 685f9db0eb3c -r 243d4738b16c sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Wed Feb 14 16:07:55 2018 +0000
+++ b/sys/netinet/raw_ip.c      Wed Feb 14 16:45:24 2018 +0000
@@ -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 @@
                        ;
 #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 @@
        }
 #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);