summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2012-01-05 17:30:15 +0000
committerRobert Watson <rwatson@FreeBSD.org>2012-01-05 17:30:15 +0000
commit19d52de5f44b8a9987349a456f44c88bff0b2daf (patch)
tree66bb30156c3141ab27370ef6bf028315a73b0539 /sys/dev
parent3d090dd20d45b1f19de0e2828b3856e06dcf13d0 (diff)
downloadsrc-test2-19d52de5f44b8a9987349a456f44c88bff0b2daf.tar.gz
src-test2-19d52de5f44b8a9987349a456f44c88bff0b2daf.zip
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/e1000/if_em.c3
-rw-r--r--sys/dev/e1000/if_lem.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 3d21da3638a5..f6cc363bf460 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -4480,8 +4480,7 @@ em_rxeof(struct rx_ring *rxr, int count, int *done)
#endif
if (status & E1000_RXD_STAT_VP) {
sendmp->m_pkthdr.ether_vtag =
- (le16toh(cur->special) &
- E1000_RXD_SPC_VLAN_MASK);
+ le16toh(cur->special);
sendmp->m_flags |= M_VLANTAG;
}
#ifndef __NO_STRICT_ALIGNMENT
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index 5fe24be92214..ae562193be4b 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -3591,8 +3591,7 @@ lem_rxeof(struct adapter *adapter, int count, int *done)
#endif
if (status & E1000_RXD_STAT_VP) {
adapter->fmp->m_pkthdr.ether_vtag =
- (le16toh(current_desc->special) &
- E1000_RXD_SPC_VLAN_MASK);
+ le16toh(current_desc->special);
adapter->fmp->m_flags |= M_VLANTAG;
}
#ifndef __NO_STRICT_ALIGNMENT