From f73cf22ade34b4628f6046cd555526b1a7e51d10 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 23 May 2001 19:25:14 +0000 Subject: [PATCH] Vlan tags are 12 bits, mask off anything above since the chip doesn't seem to do so for us. PR: 27567 Submitted by: Koji HINO hino@ccm.cl.nec.co.jp MFC after: 1 week --- sys/dev/ti/if_ti.c | 4 ++-- sys/pci/if_ti.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index 4db8b7d95f02..3e95df460fa0 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -1751,7 +1751,7 @@ static void ti_rxeof(sc) #if NVLAN > 0 if (cur_rx->ti_flags & TI_BDFLAG_VLAN_TAG) { have_tag = 1; - vlan_tag = cur_rx->ti_vlan_tag; + vlan_tag = cur_rx->ti_vlan_tag & 0xfff; } #endif @@ -2016,7 +2016,7 @@ static int ti_encap(sc, m_head, txidx) #if NVLAN > 0 if (ifv != NULL) { f->ti_flags |= TI_BDFLAG_VLAN_TAG; - f->ti_vlan_tag = ifv->ifv_tag; + f->ti_vlan_tag = ifv->ifv_tag & 0xfff; } else { f->ti_vlan_tag = 0; } diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c index 4db8b7d95f02..3e95df460fa0 100644 --- a/sys/pci/if_ti.c +++ b/sys/pci/if_ti.c @@ -1751,7 +1751,7 @@ static void ti_rxeof(sc) #if NVLAN > 0 if (cur_rx->ti_flags & TI_BDFLAG_VLAN_TAG) { have_tag = 1; - vlan_tag = cur_rx->ti_vlan_tag; + vlan_tag = cur_rx->ti_vlan_tag & 0xfff; } #endif @@ -2016,7 +2016,7 @@ static int ti_encap(sc, m_head, txidx) #if NVLAN > 0 if (ifv != NULL) { f->ti_flags |= TI_BDFLAG_VLAN_TAG; - f->ti_vlan_tag = ifv->ifv_tag; + f->ti_vlan_tag = ifv->ifv_tag & 0xfff; } else { f->ti_vlan_tag = 0; }