From cbec57fd1f18a9ed679990ff01a7c4231b30a8d7 Mon Sep 17 00:00:00 2001 From: Stephan de Wit Date: Fri, 23 Apr 2021 13:21:18 +0000 Subject: [PATCH] ax: check for IFCAP_VLAN_HWTAGGING when reading descriptor --- sys/dev/axgbe/xgbe-dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/axgbe/xgbe-dev.c b/sys/dev/axgbe/xgbe-dev.c index ade0a0f5032..629721799d2 100644 --- a/sys/dev/axgbe/xgbe-dev.c +++ b/sys/dev/axgbe/xgbe-dev.c @@ -1453,7 +1453,8 @@ xgbe_dev_read(struct xgbe_channel *channel) if (!err || !etlt) { /* No error if err is 0 or etlt is 0 */ - if (etlt == 0x09) { + if (etlt == 0x09 && + (if_getcapenable(pdata->netdev) & IFCAP_VLAN_HWTAGGING)) { XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES, VLAN_CTAG, 1); packet->vlan_ctag = XGMAC_GET_BITS_LE(rdesc->desc0,