summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-02-16 20:45:38 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-02-16 20:45:38 +0000
commit0ca63093252a9cb27fce4edeff62c1c3d68ca615 (patch)
tree39fd397c2883b9787e80d6d00dc688fd8e3a22e6
parentb6b1764f0e328cdc724cf211f9967d0c5c261e59 (diff)
Only set HW VLAN assist flag when IFCAP_VLAN_HWTAGGING is set.
-rw-r--r--sys/dev/pci/if_ti.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 87568a63095..c1a985aac4d 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ti.c,v 1.75 2006/02/16 20:16:30 brad Exp $ */
+/* $OpenBSD: if_ti.c,v 1.76 2006/02/16 20:45:37 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -1481,7 +1481,8 @@ ti_gibinit(struct ti_softc *sc)
rcb->ti_flags = TI_RCB_FLAG_HOST_RING;
rcb->ti_flags |= TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM;
#if NVLAN > 0
- rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
+ if (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING)
+ rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
#endif
rcb->ti_max_len = TI_TX_RING_CNT;
if (sc->ti_hwrev == TI_HWREV_TIGON)