Module Name: src
Committed By: msaitoh
Date: Tue Aug 20 03:50:55 UTC 2019
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Check ec_capenable instead of ec_capabilities to control TX side of VLAN HW
tagging correctly.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.141 src/sys/net/if_vlan.c:1.142
--- src/sys/net/if_vlan.c:1.141 Wed Jul 17 03:26:24 2019
+++ src/sys/net/if_vlan.c Tue Aug 20 03:50:55 2019
@@ -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 @@ vlan_start(struct ifnet *ifp)
* 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 @@ vlan_transmit(struct ifnet *ifp, struct
* 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 {
/*
