[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180725023125.26925-1-jianbol@mellanox.com>
Date: Wed, 25 Jul 2018 02:31:25 +0000
From: Jianbo Liu <jianbol@...lanox.com>
To: netdev@...r.kernel.org, davem@...emloft.net
Cc: Jianbo Liu <jianbol@...lanox.com>,
Jamal Hadi Salim <jhs@...atatu.com>,
Cong Wang <xiyou.wangcong@...il.com>,
Jiri Pirko <jiri@...nulli.us>
Subject: [PATCH net-next] 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: Jianbo Liu <jianbol@...lanox.com>
Reported-by: Or Gerlitz <ogerlitz@...lanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@...lanox.com>
---
net/sched/cls_flower.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index c53fdd4..1d8559d 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1340,8 +1340,8 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
TCA_FLOWER_KEY_CVLAN_PRIO,
&key->cvlan, &mask->cvlan) ||
(mask->cvlan.vlan_tpid &&
- nla_put_u16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE,
- key->cvlan.vlan_tpid)))
+ nla_put_be16(skb, TCA_FLOWER_KEY_VLAN_ETH_TYPE,
+ key->cvlan.vlan_tpid)))
goto nla_put_failure;
if (mask->basic.n_proto) {
--
2.9.5
Powered by blists - more mailing lists