diff mbox series

[net-next] net/sched: cls_flower: Use correct inline function for assignment of vlan tpid

Message ID 20180725023125.26925-1-jianbol@mellanox.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net-next] net/sched: cls_flower: Use correct inline function for assignment of vlan tpid | expand

Commit Message

Jianbo Liu July 25, 2018, 2:31 a.m. UTC
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@mellanox.com>
Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
---
 net/sched/cls_flower.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller July 25, 2018, 11:34 p.m. UTC | #1
From: Jianbo Liu <jianbol@mellanox.com>
Date: Wed, 25 Jul 2018 02:31:25 +0000

> 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@mellanox.com>
> Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
> Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>

Applied, thank you.
diff mbox series

Patch

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) {