[src/netbsd-7]: src/sys/netinet Pull up following revision(s) (requested by h...

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

details:   https://anonhg.NetBSD.org/src/rev/0d4c7132feeb
branches:  netbsd-7
changeset: 798457:0d4c7132feeb
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 24 07:28:14 2014 +0000

description:
Pull up following revision(s) (requested by hikaru in ticket #154):
        sys/netinet/tcp_output.c: revision 1.177
Fix wrong condition checking TSO capability.
ipsec_used is not necessary condition.
IPsec outbound policy will not be checked when ipsec_used is false.

diffstat:

 sys/netinet/tcp_output.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 3bd9607a33c0 -r 0d4c7132feeb sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Wed Oct 22 12:28:52 2014 +0000
+++ b/sys/netinet/tcp_output.c  Fri Oct 24 07:28:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.176 2014/05/30 01:39:03 christos Exp $        */
+/*     $NetBSD: tcp_output.c,v 1.176.2.1 2014/10/24 07:28:14 martin Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.176 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.176.2.1 2014/10/24 07:28:14 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -630,8 +630,8 @@
 #if defined(INET)
        has_tso4 = tp->t_inpcb != NULL &&
 #if defined(IPSEC)
-           ipsec_used && IPSEC_PCB_SKIP_IPSEC(tp->t_inpcb->inp_sp,
-           IPSEC_DIR_OUTBOUND) &&
+           (!ipsec_used || IPSEC_PCB_SKIP_IPSEC(tp->t_inpcb->inp_sp,
+           IPSEC_DIR_OUTBOUND)) &&
 #endif
            (rt = rtcache_validate(&tp->t_inpcb->inp_route)) != NULL &&
            (rt->rt_ifp->if_capenable & IFCAP_TSOv4) != 0;
@@ -639,8 +639,8 @@
 #if defined(INET6)
        has_tso6 = tp->t_in6pcb != NULL &&
 #if defined(IPSEC)
-           ipsec_used && IPSEC_PCB_SKIP_IPSEC(tp->t_in6pcb->in6p_sp,
-           IPSEC_DIR_OUTBOUND) &&
+           (!ipsec_used || IPSEC_PCB_SKIP_IPSEC(tp->t_in6pcb->in6p_sp,
+           IPSEC_DIR_OUTBOUND)) &&
 #endif
            (rt = rtcache_validate(&tp->t_in6pcb->in6p_route)) != NULL &&
            (rt->rt_ifp->if_capenable & IFCAP_TSOv6) != 0;