Source-Changes-HG archive

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

[src/trunk]: src/sys/net Check ec_capenable instead of ec_capabilities to con...



details:   https://anonhg.NetBSD.org/src/rev/7bff75f40f93
branches:  trunk
changeset: 964853:7bff75f40f93
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Aug 20 03:50:55 2019 +0000

description:
Check ec_capenable instead of ec_capabilities to control TX side of VLAN HW
tagging correctly.

XXX pullup-9

diffstat:

 sys/net/if_vlan.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 9b491b33c780 -r 7bff75f40f93 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Tue Aug 20 02:42:04 2019 +0000
+++ b/sys/net/if_vlan.c Tue Aug 20 03:50:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.141 2019/07/17 03:26:24 msaitoh Exp $    */
+/*     $NetBSD: if_vlan.c,v 1.142 2019/08/20 03:50:55 msaitoh Exp $    */
 
 /*
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.141 2019/07/17 03:26:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.142 2019/08/20 03:50:55 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1373,7 +1373,7 @@
                 * If the parent can insert the tag itself, just mark
                 * the tag in the mbuf header.
                 */
-               if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
+               if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
                        vlan_set_tag(m, mib->ifvm_tag);
                } else {
                        /*
@@ -1491,7 +1491,7 @@
         * If the parent can insert the tag itself, just mark
         * the tag in the mbuf header.
         */
-       if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING) {
+       if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
                vlan_set_tag(m, mib->ifvm_tag);
        } else {
                /*



Home | Main Index | Thread Index | Old Index