aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net
diff options
context:
space:
mode:
authorVladimir Oltean <olteanv@gmail.com>2020-05-13 03:23:27 +0300
committerDavid S. Miller <davem@davemloft.net>2020-05-12 18:02:42 -0700
commitfb9f2e92864f51d25e790947cca2ac4426a12f9c (patch)
tree9a5578f9da2bd69b082d31d9e7f4b1f8ac36af5b /net
parenterspan: Check IFLA_GRE_ERSPAN_VER is set. (diff)
downloadwireguard-linux-fb9f2e92864f51d25e790947cca2ac4426a12f9c.tar.xz
wireguard-linux-fb9f2e92864f51d25e790947cca2ac4426a12f9c.zip
net: dsa: tag_sja1105: appease sparse checks for ethertype accessors
A comparison between a value from the packet and an integer constant value needs to be done by converting the value from the packet from net->host, or the constant from host->net. Not the other way around. Even though it makes no practical difference, correct that. Fixes: 38b5beeae7a4 ("net: dsa: sja1105: prepare tagger for handling DSA tags and VLAN simultaneously") Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dsa/tag_sja1105.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index ad105550b145..9b4a4d719291 100644
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -73,10 +73,10 @@ static bool sja1105_can_use_vlan_as_tags(const struct sk_buff *skb)
{
struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
- if (hdr->h_vlan_proto == ntohs(ETH_P_SJA1105))
+ if (hdr->h_vlan_proto == htons(ETH_P_SJA1105))
return true;
- if (hdr->h_vlan_proto != ntohs(ETH_P_8021Q))
+ if (hdr->h_vlan_proto != htons(ETH_P_8021Q))
return false;
return vid_is_dsa_8021q(ntohs(hdr->h_vlan_TCI) & VLAN_VID_MASK);