Module Name: src Committed By: martin Date: Wed May 9 15:21:02 UTC 2018
Modified Files: src/sys/dev/ic [netbsd-8]: hme.c Log Message: Pull up following revision(s) (requested by pgoyette in ticket #815): 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.96 -r1.96.2.1 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.96 src/sys/dev/ic/hme.c:1.96.2.1 --- src/sys/dev/ic/hme.c:1.96 Tue May 23 02:19:14 2017 +++ src/sys/dev/ic/hme.c Wed May 9 15:21:02 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: hme.c,v 1.96 2017/05/23 02:19:14 ozaki-r Exp $ */ +/* $NetBSD: hme.c,v 1.96.2.1 2018/05/09 15:21:02 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.96 2017/05/23 02:19:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.96.2.1 2018/05/09 15:21:02 martin Exp $"); /* #define HMEDEBUG */ @@ -753,7 +753,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);