Page MenuHomeFreeBSD
Files F153757558

D7785.id.diff
No OneTemporary
Actions

D7785.id.diff
View Options

Index: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
===================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -903,8 +903,10 @@
rppi_vlan_info = (ndis_8021q_info *)((uint8_t *)rppi +
rppi->per_packet_info_offset);
- rppi_vlan_info->u1.s1.vlan_id =
- m_head->m_pkthdr.ether_vtag & 0xfff;
+ rppi_vlan_info->u1.value = NDIS_VLAN_INFO_MAKE(
+ EVL_VLANOFTAG(m_head->m_pkthdr.ether_vtag),
+ EVL_PRIOFTAG(m_head->m_pkthdr.ether_vtag),
+ EVL_CFIOFTAG(m_head->m_pkthdr.ether_vtag));
}
if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
Index: head/sys/dev/hyperv/netvsc/ndis.h
===================================================================
--- head/sys/dev/hyperv/netvsc/ndis.h
+++ head/sys/dev/hyperv/netvsc/ndis.h
@@ -213,7 +213,7 @@
#define NDIS_VLAN_INFO_CFI_MASK 0x0008
#define NDIS_VLAN_INFO_ID_MASK 0xfff0
#define NDIS_VLAN_INFO_MAKE(id, pri, cfi) \
- (((pri) & NVIS_VLAN_INFO_PRI_MASK) | \
+ (((pri) & NDIS_VLAN_INFO_PRI_MASK) | \
(((cfi) & 0x1) << 3) | (((id) & 0xfff) << 4))
#define NDIS_VLAN_INFO_ID(inf) (((inf) & NDIS_VLAN_INFO_ID_MASK) >> 4)
#define NDIS_VLAN_INFO_CFI(inf) (((inf) & NDIS_VLAN_INFO_CFI_MASK) >> 3)

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 11:46 AM (16 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31888756
Default Alt Text
D7785.id.diff (1 KB)

Event Timeline