summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2001-05-07 18:48:32 +0000
committerJason Wright <jason@cvs.openbsd.org>2001-05-07 18:48:32 +0000
commit8484af4e1f8845b3977f391f1e152cb0de68fee7 (patch)
tree693f0073071afe2d0c78cf1e08b3bbb88b47b4c8 /sys/dev
parentd5c21285b8330627d899d1c4cc6a02c86add7fce (diff)
Now that if_vlan switches types to match it's parent, checking if_type
to see if it's IFT_8021Q_VLAN is no longer valid ; change test to M_PROTO1 being set and rcvif not being null.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_ti.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 498d1d8fcc0..a120af151cc 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.18 2001/03/28 04:11:34 jason Exp $ */
+/* $OpenBSD: if_ti.c,v 1.19 2001/05/07 18:48:31 jason Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -1985,8 +1985,7 @@ int ti_encap(sc, m_head, txidx)
struct ifvlan *ifv = NULL;
if ((m_head->m_flags & (M_PROTO1|M_PKTHDR)) == (M_PROTO1|M_PKTHDR) &&
- m_head->m_pkthdr.rcvif != NULL &&
- m_head->m_pkthdr.rcvif->if_type == IFT_8021_VLAN)
+ m_head->m_pkthdr.rcvif != NULL)
ifv = m_head->m_pkthdr.rcvif->if_softc;
#endif