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

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

details:   https://anonhg.NetBSD.org/src/rev/249570b4a29b
branches:  netbsd-8
changeset: 445770:249570b4a29b
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 12 08:50:18 2018 +0000

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

        sys/net/if_gif.c: revision 1.145

Fix ALTQ on gif(4). Reported and tested by Anthony Mallet, advised by Greg Troxel, thanks.

l2tp(4) and ipsecif(4) don't support ALTQ yet. So, they don't require this fix.

XXX pullup-8

diffstat:

 sys/net/if_gif.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r d92927dbedac -r 249570b4a29b sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Nov 12 08:46:54 2018 +0000
+++ b/sys/net/if_gif.c  Mon Nov 12 08:50:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.126.2.12 2018/10/21 11:55:54 martin Exp $ */
+/*     $NetBSD: if_gif.c,v 1.126.2.13 2018/11/12 08:50:18 martin Exp $ */
 /*     $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.12 2018/10/21 11:55:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.13 2018/11/12 08:50:18 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -489,7 +489,8 @@
        m->m_pkthdr.csum_flags = 0;
        m->m_pkthdr.csum_data = 0;
 
-       error = gif_transmit_direct(var, m);
+       error = if_transmit_lock(ifp, m);
+
 end:
        if (var != NULL)
                gif_putref_variant(var, &psref);