From de13c80e9bcd009519f9d2ccbffa041daa7c02af Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Wed, 26 Jan 2005 11:40:58 +0000 Subject: [PATCH] Disable use of hardware VLAN tagging and stripping in if_em in the default configuration: it appears to work properly in the non-promiscuous case, but we've not yet implemented a more general solution that maintains full functionality with promiscuous mode enabled. While my hope is that we can get one implemented soon, this will improve functionality substantially in the mean time. MFC after: 3 days --- sys/dev/em/if_em.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index cd2b77ef0a26..36fadddfdb35 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -1945,7 +1945,7 @@ em_setup_interface(device_t dev, struct adapter * adapter) ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); #if __FreeBSD_version >= 500000 ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; - ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; #endif #ifdef DEVICE_POLLING