svn commit: r209534 - user/jmallett/octeon/sys/mips/cavium/octe

[Juli Mallett]

Author: jmallett
Date: Sat Jun 26 07:59:57 2010
New Revision: 209534
URL: http://svn.freebsd.org/changeset/base/209534

Log:
  Don't try to use VLAN hw tagging, it doesn't seem to work as I'd hoped.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c
  user/jmallett/octeon/sys/mips/cavium/octe/octe.c

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c	Sat Jun 26 07:42:33 2010	(r209533)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c	Sat Jun 26 07:59:57 2010	(r209534)
@@ -326,11 +326,6 @@ void cvm_oct_tasklet_rx(void *context, i
 					m->m_pkthdr.csum_data = 0xffff;
 				}
 
-				if (work->word2.s.vlan_valid) {
-					m->m_pkthdr.ether_vtag = work->word2.s.vlan_id;
-					m->m_flags |= M_VLANTAG;
-				}
-
 				if (priv->intercept_cb) {
 					callback_result = priv->intercept_cb(ifp, work, m);
 

Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Sat Jun 26 07:42:33 2010	(r209533)
+++ user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Sat Jun 26 07:59:57 2010	(r209534)
@@ -192,7 +192,7 @@ octe_attach(device_t dev)
 	ether_ifattach(ifp, priv->mac);
 
 	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
-	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | IFCAP_HWCSUM;
+	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_HWCSUM;
 	ifp->if_capenable = ifp->if_capabilities;
 	ifp->if_hwassist = CSUM_TCP | CSUM_UDP;