The previous code incorrectly parsed the VLAN ID and priority.
If the 16-bits of VLAN ID and priority/CFI on the wire was
0123456789ABCDEF the code parsed it as 456789ABCDEF3012. There
were macros defined to handle this conversion but they were not
used.
Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Alan Elder <[email protected]>
---
v4:
* Make consistent with FreeBSD code
.mailmap | 1 +
drivers/net/netvsc/hn_rxtx.c | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index a0756974e2..eca02318d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Alain Leon <[email protected]>
Alan Brady <[email protected]>
Alan Carew <[email protected]>
Alan Dewar <[email protected]> <[email protected]>
+Alan Elder <[email protected]>
Alan Liu <[email protected]>
Alan Winkowski <[email protected]>
Alejandro Lucero <[email protected]>
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index e4f5015aa3..1cbb8df03f 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -42,6 +42,19 @@
#define HN_TXD_CACHE_SIZE 32 /* per cpu tx_descriptor pool cache */
#define HN_RXQ_EVENT_DEFAULT 2048
+#define HN_VLAN_CFI_SHIFT 12
+#define HN_VLAN_PRI_SHIFT 13
+#define HN_VLAN_PRI_MASK 0xe000 /* Priority Code Point */
+#define HN_VLAN_CFI_MASK 0x1000 /* Canonical Format Indicator / Drop
Eligible Indicator */
+#define HN_VLAN_VID_MASK 0x0fff /* VLAN Identifier */
+
+#define HN_VLAN_TCI_ID(vlan_tci) ((vlan_tci) & HN_VLAN_VID_MASK)
+#define HN_VLAN_TCI_PRI(vlan_tci) (((vlan_tci) & HN_VLAN_PRI_MASK) >>
HN_VLAN_PRI_SHIFT)
+#define HN_VLAN_TCI_CFI(vlan_tci) (((vlan_tci) & HN_VLAN_CFI_MASK) >>
HN_VLAN_CFI_SHIFT)
+#define HN_VLAN_TCI_MAKE(id, pri, cfi) ((id) | \
+ ((pri) << HN_VLAN_PRI_SHIFT) | \
+ ((cfi) << HN_VLAN_CFI_SHIFT))
+
struct hn_rxinfo {
uint32_t vlan_info;
uint32_t csum_info;
@@ -612,7 +625,9 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct
hn_rx_bufinfo *rxb,
RTE_PTYPE_L4_MASK);
if (info->vlan_info != HN_NDIS_VLAN_INFO_INVALID) {
- m->vlan_tci = info->vlan_info;
+ m->vlan_tci =
HN_VLAN_TCI_MAKE(NDIS_VLAN_INFO_ID(info->vlan_info),
+
NDIS_VLAN_INFO_PRI(info->vlan_info),
+
NDIS_VLAN_INFO_CFI(info->vlan_info));
m->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED | RTE_MBUF_F_RX_VLAN;
/* NDIS always strips tag, put it back if necessary */
@@ -1332,7 +1347,9 @@ static void hn_encap(struct rndis_packet_msg *pkt,
if (m->ol_flags & RTE_MBUF_F_TX_VLAN) {
pi_data = hn_rndis_pktinfo_append(pkt, NDIS_VLAN_INFO_SIZE,
NDIS_PKTINFO_TYPE_VLAN);
- *pi_data = m->vlan_tci;
+ *pi_data = NDIS_VLAN_INFO_MAKE(HN_VLAN_TCI_ID(m->vlan_tci),
+ HN_VLAN_TCI_PRI(m->vlan_tci),
+ HN_VLAN_TCI_CFI(m->vlan_tci));
}
if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
--
2.25.1
