summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-11-14 14:07:33 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-11-14 14:07:33 +0000
commit9903db75823d2d4deb0e130d1a86d41a9647ba72 (patch)
treeca3693902be9838fe9825ffcdb7e56710dc08450 /sys/dev
parent8f371894198e0faf7c0e4edfc8378c95aff5aa03 (diff)
remove unused HW VLAN tagging support which cannot be used due to HW limitations.
ok dlg@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_em.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 4bf1370055d..7faf78a1244 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_em.c,v 1.85 2005/11/13 03:48:07 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.86 2005/11/14 14:07:32 brad Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -894,9 +894,7 @@ em_encap(struct em_softc *sc, struct mbuf **m_headp)
DESC_ARRAY desc_array;
u_int32_t array_elements;
u_int32_t counter;
-#if NVLAN > 0
- struct ifvlan *ifv = NULL;
-#endif
+
struct em_q q;
struct em_buffer *tx_buffer = NULL;
@@ -944,13 +942,6 @@ em_encap(struct em_softc *sc, struct mbuf **m_headp)
#endif
txd_upper = txd_lower = 0;
-#if NVLAN > 0
- /* Find out if we are in vlan mode */
- if ((m_head->m_flags & (M_PROTO1|M_PKTHDR)) == (M_PROTO1|M_PKTHDR) &&
- m_head->m_pkthdr.rcvif != NULL)
- ifv = m_head->m_pkthdr.rcvif->if_softc;
-#endif
-
i = sc->next_avail_tx_desc;
if (sc->pcix_82544) {
txd_saved = i;
@@ -1013,16 +1004,6 @@ em_encap(struct em_softc *sc, struct mbuf **m_headp)
sc->num_tx_desc_avail -= q.map->dm_nsegs;
}
-#if NVLAN > 0
- if (ifv != NULL) {
- /* Set the vlan id */
- current_tx_desc->upper.fields.special = htole16(ifv->ifv_tag);
-
- /* Tell hardware to add tag */
- current_tx_desc->lower.data |= htole32(E1000_TXD_CMD_VLE);
- }
-#endif
-
tx_buffer->m_head = m_head;
tx_buffer->map = q.map;
bus_dmamap_sync(sc->txtag, q.map, 0, q.map->dm_mapsize,