Module Name: src
Committed By: martin
Date: Wed Oct 27 18:52:51 UTC 2021
Modified Files:
src/sys/net [netbsd-8]: if_ethersubr.c
Log Message:
Fix merge mishap from previous (ticket #1704)
To generate a diff of this commit:
cvs rdiff -u -r1.242.6.8 -r1.242.6.9 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.242.6.8 src/sys/net/if_ethersubr.c:1.242.6.9
--- src/sys/net/if_ethersubr.c:1.242.6.8 Mon Oct 25 18:16:07 2021
+++ src/sys/net/if_ethersubr.c Wed Oct 27 18:52:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.242.6.8 2021/10/25 18:16:07 martin Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.242.6.9 2021/10/27 18:52:51 martin 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.242.6.8 2021/10/25 18:16:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.9 2021/10/27 18:52:51 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -707,7 +707,7 @@ ether_input(struct ifnet *ifp, struct mb
* type, and if IP or IPV6, let them deal with it.
*/
if (m->m_len <= sizeof(*evl)
- && EVL_VLANOFTAG((ntohs(evl->evl_tag)) == 0) {
+ && EVL_VLANOFTAG((ntohs(evl->evl_tag))) == 0) {
etype = ntohs(evl->evl_proto);
ehlen = sizeof(*evl);
if ((m->m_flags & M_PROMISC) == 0
