Source-Changes-HG archive

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

[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ryo i...



details:   https://anonhg.NetBSD.org/src/rev/aca4d2ec534d
branches:  netbsd-8
changeset: 990073:aca4d2ec534d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 25 18:16:07 2021 +0000

description:
Pull up following revision(s) (requested by ryo in ticket #1704):

        sys/net/if_ethersubr.c: revision 1.302

frame's vlan tag must be ntohs()'ed.

VLAN 0 Priority tag was misrecognized on non vlan-hwtagging interfaces.

diffstat:

 sys/net/if_ethersubr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9bfd6e8afc45 -r aca4d2ec534d sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Mon Oct 25 15:50:37 2021 +0000
+++ b/sys/net/if_ethersubr.c    Mon Oct 25 18:16:07 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.242.6.7 2019/10/08 18:12:44 martin Exp $    */
+/*     $NetBSD: if_ethersubr.c,v 1.242.6.8 2021/10/25 18:16:07 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.7 2019/10/08 18:12:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.8 2021/10/25 18:16:07 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -707,7 +707,7 @@
                 * type, and if IP or IPV6, let them deal with it.
                 */
                if (m->m_len <= sizeof(*evl)
-                   && EVL_VLANOFTAG(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



Home | Main Index | Thread Index | Old Index