Module Name: src
Committed By: knakahara
Date: Mon Nov 12 03:37:33 UTC 2018
Modified Files:
src/sys/net: if_gif.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/net/if_gif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.144 src/sys/net/if_gif.c:1.145
--- src/sys/net/if_gif.c:1.144 Fri Oct 19 00:12:56 2018
+++ src/sys/net/if_gif.c Mon Nov 12 03:37:33 2018
@@ -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 @@ gif_output(struct ifnet *ifp, struct mbu
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);
