Module Name: src
Committed By: martin
Date: Mon May 14 16:07:06 UTC 2018
Modified Files:
src/sys/dev/ic [netbsd-6]: hme.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1548):
sys/dev/ic/hme.c: revision 1.97
Fix mis-placed right paren. kern/53271
To generate a diff of this commit:
cvs rdiff -u -r1.87.2.1 -r1.87.2.2 src/sys/dev/ic/hme.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/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.87.2.1 src/sys/dev/ic/hme.c:1.87.2.2
--- src/sys/dev/ic/hme.c:1.87.2.1 Wed Jul 4 19:43:10 2012
+++ src/sys/dev/ic/hme.c Mon May 14 16:07:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $ */
+/* $NetBSD: hme.c,v 1.87.2.2 2018/05/14 16:07:06 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.87.2.2 2018/05/14 16:07:06 martin Exp $");
/* #define HMEDEBUG */
@@ -752,7 +752,7 @@ hme_get(struct hme_softc *sc, int ri, ui
pktlen = m0->m_pkthdr.len - ETHER_HDR_LEN;
} else if (ntohs(eh->ether_type) == ETHERTYPE_VLAN) {
evh = (struct ether_vlan_header *)eh;
- if (ntohs(evh->evl_proto != ETHERTYPE_IP))
+ if (ntohs(evh->evl_proto) != ETHERTYPE_IP)
goto swcsum;
ip = (struct ip *)((char *)eh + ETHER_HDR_LEN +
ETHER_VLAN_ENCAP_LEN);
