Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/dev/ic Pull up following revision(s) (requested by pg...



details:   https://anonhg.NetBSD.org/src/rev/a3be0b6b06bc
branches:  netbsd-8
changeset: 434982:a3be0b6b06bc
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 09 15:21:02 2018 +0000

description:
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

diffstat:

 sys/dev/ic/hme.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5eb3e323abd7 -r a3be0b6b06bc sys/dev/ic/hme.c
--- a/sys/dev/ic/hme.c  Wed May 09 14:52:40 2018 +0000
+++ b/sys/dev/ic/hme.c  Wed May 09 15:21:02 2018 +0000
@@ -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 @@
                        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);



Home | Main Index | Thread Index | Old Index