D48987.diff
No OneTemporary
Actions

Size

923 B

Referenced Files

None

Subscribers

None

D48987.diff
View Options

	diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h
	--- a/sys/dev/e1000/e1000_defines.h
	+++ b/sys/dev/e1000/e1000_defines.h
	@@ -130,7 +130,6 @@
	#define E1000_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */
	#define E1000_RXD_ERR_IPE 0x40 /* IP Checksum Error */
	#define E1000_RXD_ERR_RXE 0x80 /* Rx Data Error */
	-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */

	#define E1000_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */
	#define E1000_RXDEXT_STATERR_LB 0x00040000
	diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c
	--- a/sys/dev/e1000/em_txrx.c
	+++ b/sys/dev/e1000/em_txrx.c
	@@ -710,8 +710,7 @@

	if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING &&
	status & E1000_RXD_STAT_VP) {
	- ri->iri_vtag =
	- le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK);
	+ ri->iri_vtag = le16toh(rxd->special);
	ri->iri_flags \|= M_VLANTAG;
	}