Module Name: src
Committed By: maxv
Date: Tue Feb 13 10:50:38 UTC 2018
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Remove KERNEL_LOCK around the MPLS code. It's not needed, since we're only
touching the tag of the mbuf - the tag belongs only to the mbuf, and the
mbuf is not shared.
ok knakahara@
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/net/if_ethersubr.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_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.258 src/sys/net/if_ethersubr.c:1.259
--- src/sys/net/if_ethersubr.c:1.258 Mon Feb 12 12:17:38 2018
+++ src/sys/net/if_ethersubr.c Tue Feb 13 10:50:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.258 2018/02/12 12:17:38 maxv Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.259 2018/02/13 10:50:38 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.258 2018/02/12 12:17:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.259 2018/02/13 10:50:38 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -380,7 +380,6 @@ ether_output(struct ifnet * const ifp0,
}
#ifdef MPLS
- KERNEL_LOCK(1, NULL);
{
struct m_tag *mtag;
mtag = m_tag_find(m, PACKET_TAG_MPLS, NULL);
@@ -390,7 +389,6 @@ ether_output(struct ifnet * const ifp0,
m_tag_delete(m, mtag);
}
}
- KERNEL_UNLOCK_ONE(NULL);
#endif
if (mcopy)
