[src/netbsd-8]: src/sys/netipsec Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/a225886e312e
branches:  netbsd-8
changeset: 451637:a225886e312e
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 29 15:57:38 2019 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #1273):

        sys/netipsec/ipsecif.c: revision 1.16

Don't clear calculated Tx tos value for IPv[46] over IPv6.

diffstat:

 sys/netipsec/ipsecif.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 8e95fb5ada9b -r a225886e312e sys/netipsec/ipsecif.c
--- a/sys/netipsec/ipsecif.c    Wed May 29 15:51:40 2019 +0000
+++ b/sys/netipsec/ipsecif.c    Wed May 29 15:57:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsecif.c,v 1.1.2.7 2018/05/17 14:07:03 martin Exp $  */
+/*     $NetBSD: ipsecif.c,v 1.1.2.8 2019/05/29 15:57:38 martin Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsecif.c,v 1.1.2.7 2018/05/17 14:07:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsecif.c,v 1.1.2.8 2019/05/29 15:57:38 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -557,13 +557,13 @@
                return ENETUNREACH;
        }
 #ifndef IPSEC_TX_TOS_CLEAR
+       if (!ip6_ipsec_copy_tos)
+               otos = 0;
+
        if (ifp->if_flags & IFF_ECN)
                ip_ecn_ingress(ECN_ALLOWED, &otos, &itos);
        else
                ip_ecn_ingress(ECN_NOCARE, &otos, &itos);
-
-       if (!ip6_ipsec_copy_tos)
-               otos = 0;
 #else
        if (ip6_ipsec_copy_tos)
                otos = itos;