Commit 158abbf1 authored by Jianbo Liu's avatar Jianbo Liu Committed by David S. Miller

net/sched: cls_flower: Use correct inline function for assignment of vlan tpid

This fixes the following sparse warning:

net/sched/cls_flower.c:1356:36: warning: incorrect type in argument 3 (different base types)
net/sched/cls_flower.c:1356:36: expected unsigned short [unsigned] [usertype] value
net/sched/cls_flower.c:1356:36: got restricted __be16 [usertype] vlan_tpid
Signed-off-by: default avatarJianbo Liu <jianbol@mellanox.com>
Reported-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cc77bf4
...@@ -1445,8 +1445,8 @@ static int fl_dump_key(struct sk_buff *skb, struct net *net, ...@@ -1445,8 +1445,8 @@ static int fl_dump_key(struct sk_buff *skb, struct net *net,
TCA_FLOWER_KEY_CVLAN_PRIO, TCA_FLOWER_KEY_CVLAN_PRIO,
&key->cvlan, &mask->cvlan) || &key->cvlan, &mask->cvlan) ||
(mask->cvlan.vlan_tpid && (mask->cvlan.vlan_tpid &&
nla_put_u16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE, nla_put_be16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE,
key->cvlan.vlan_tpid))) key->cvlan.vlan_tpid)))
goto nla_put_failure; goto nla_put_failure;
if (mask->basic.n_proto) { if (mask->basic.n_proto) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment