From: Andrew Lunn <andrew@lunn.ch>
Date: Sun, 5 Jul 2020 19:38:08 +0000 (+0200)
Subject: net: dsa: mv88e6xxx: vlan_tci is __be16
X-Git-Tag: v5.9-rc1~133^2~335^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=048442807aba49898a502fa7a87f4b48776359ff;p=thirdparty%2Fkernel%2Flinux.git

net: dsa: mv88e6xxx: vlan_tci is __be16

The flow spec member vlan_tci is in network order. Hence comparisons
should be made again network order values.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 7627ea61e0ea8..d995f5bf0d40f 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1751,7 +1751,7 @@ static int mv88e6xxx_policy_insert(struct mv88e6xxx_chip *chip, int port,
 	}
 
 	if ((fs->flow_type & FLOW_EXT) && fs->m_ext.vlan_tci) {
-		if (fs->m_ext.vlan_tci != 0xffff)
+		if (fs->m_ext.vlan_tci != htons(0xffff))
 			return -EOPNOTSUPP;
 		vid = be16_to_cpu(fs->h_ext.vlan_tci) & VLAN_VID_MASK;
 	}