diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2005-07-18 06:29:55 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2005-07-18 06:29:55 +0000 |
| commit | b4d6d93faf460ea05b87fc0f74122785636e23d8 (patch) | |
| tree | 8f747e28992c59847c6ecb011282db5bcbf14fe8 /sys | |
| parent | c77270f1e36599968c097c5bd1210c2f80e85416 (diff) | |
disable hardware vlan tag stripping
tested by Janjaap Velthoven
ok brad
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_ti.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 260057462f7..e4bf5a30dfd 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.67 2005/07/08 01:49:51 brad Exp $ */ +/* $OpenBSD: if_ti.c,v 1.68 2005/07/18 06:29:54 camield Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1449,9 +1449,6 @@ int ti_gibinit(sc) rcb->ti_max_len = ETHER_MAX_LEN; rcb->ti_flags = 0; 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; -#endif /* Set up the jumbo receive ring. */ rcb = &sc->ti_rdata->ti_info.ti_jumbo_rx_rcb; @@ -1459,9 +1456,6 @@ int ti_gibinit(sc) rcb->ti_max_len = ETHER_MAX_LEN_JUMBO; rcb->ti_flags = 0; 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; -#endif /* * Set up the mini ring. Only activated on the @@ -1476,9 +1470,6 @@ int ti_gibinit(sc) else rcb->ti_flags = 0; 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; -#endif /* * Set up the receive return ring. @@ -1796,10 +1787,6 @@ void ti_rxeof(sc) struct ti_rx_desc *cur_rx; u_int32_t rxidx; struct mbuf *m = NULL; -#if NVLAN > 0 - u_int16_t vlan_tag = 0; - int have_tag = 0; -#endif int sumflags = 0; #ifdef TI_CSUM_OFFLOAD struct ip *ip; @@ -1811,13 +1798,6 @@ void ti_rxeof(sc) rxidx = cur_rx->ti_idx; TI_INC(sc->ti_rx_saved_considx, TI_RETURN_RING_CNT); -#if NVLAN > 0 - if (cur_rx->ti_flags & TI_BDFLAG_VLAN_TAG) { - have_tag = 1; - vlan_tag = cur_rx->ti_vlan_tag; - } -#endif - if (cur_rx->ti_flags & TI_BDFLAG_JUMBO_RING) { TI_INC(sc->ti_jumbo, TI_JUMBO_RX_RING_CNT); m = sc->ti_cdata.ti_rx_jumbo_chain[rxidx]; @@ -1896,18 +1876,6 @@ void ti_rxeof(sc) m->m_pkthdr.csum_flags = sumflags; sumflags = 0; -#if NVLAN > 0 - /* - * If we received a packet with a vlan tag, pass it - * to vlan_input() instead of ether_input(). - */ - if (have_tag) { - if (vlan_input_tag(m, vlan_tag) < 0) - ifp->if_data.ifi_noproto++; - have_tag = vlan_tag = 0; - continue; - } -#endif ether_input_mbuf(ifp, m); } |