diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2008-10-16 19:18:04 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2008-10-16 19:18:04 +0000 |
| commit | 7b27043f229c9133ae33baf4b80e762cd23177b0 (patch) | |
| tree | f9d77bd5838c2cbb2089d11dd8b1a4f243c14f0d /sys/dev/pci/if_nfe.c | |
| parent | 90aabd4ca2cee27b46f35ad2bde34bdc150da7d6 (diff) | |
Switch the existing TX VLAN hardware support over to having the
tag in the header. Convert TX tagging in the drivers.
Help and ok brad@
Diffstat (limited to 'sys/dev/pci/if_nfe.c')
| -rw-r--r-- | sys/dev/pci/if_nfe.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 79d09748713..0552416b24c 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.82 2008/10/02 20:21:14 brad Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.83 2008/10/16 19:18:03 naddy Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -933,11 +933,8 @@ nfe_encap(struct nfe_softc *sc, struct mbuf *m0) #if NVLAN > 0 /* setup h/w VLAN tagging */ - if ((m0->m_flags & (M_PROTO1 | M_PKTHDR)) == (M_PROTO1 | M_PKTHDR) && - m0->m_pkthdr.rcvif != NULL) { - struct ifvlan *ifv = m0->m_pkthdr.rcvif->if_softc; - vtag = NFE_TX_VTAG | htons(ifv->ifv_tag); - } + if (m0->m_flags & M_VLANTAG) + vtag = NFE_TX_VTAG | htons(m0->m_pkthdr.ether_vtag); #endif if (m0->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT) flags |= NFE_TX_IP_CSUM; |