Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Fix ALTQ on gif(4). Reported and tested by Anthony M...



details:   https://anonhg.NetBSD.org/src/rev/ff8f2bc7ed7d
branches:  trunk
changeset: 445763:ff8f2bc7ed7d
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Nov 12 03:37:33 2018 +0000

description:
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 9bd70681bc7d -r ff8f2bc7ed7d sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Nov 12 00:56:26 2018 +0000
+++ b/sys/net/if_gif.c  Mon Nov 12 03:37:33 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.144 2018/10/19 00:12:56 knakahara Exp $   */
+/*     $NetBSD: if_gif.c,v 1.145 2018/11/12 03:37:33 knakahara 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.144 2018/10/19 00:12:56 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.145 2018/11/12 03:37:33 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -487,7 +487,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);



Home | Main Index | Thread Index | Old Index