leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/flower: Fix pointer cast

Browse Source 
Cast pointer to unsigned long instead of u64, to fix compilation warning
on 32 bit arch, spotted by 0day build.

Fixes: 5b33f48 ("net/flower: Introduce hardware offload support")
Signed-off-by: Amir Vadai <amir@vadai.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amir Vadai
2016-03-11 11:08:45 +02:00
committed by David S. Miller
parent e8ab563f4b
commit 8208d21bf3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/pkt_cls.h
View File

@@ -416,7 +416,7 @@ enum tc_fl_command {
struct tc_cls_flower_offload { struct tc_cls_flower_offload {
enum tc_fl_command command; enum tc_fl_command command;
u64 cookie; unsigned long cookie;
struct flow_dissector *dissector; struct flow_dissector *dissector;
struct fl_flow_key *mask; struct fl_flow_key *mask;
struct fl_flow_key *key; struct fl_flow_key *key;

12
net/sched/cls_flower.c
View File

@@ -165,7 +165,7 @@ static void fl_destroy_filter(struct rcu_head *head)
kfree(f); kfree(f);
} }
static void fl_hw_destroy_filter(struct tcf_proto *tp, u64 cookie) static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie)
{ {
struct net_device *dev = tp->q->dev_queue->dev; struct net_device *dev = tp->q->dev_queue->dev;
struct tc_cls_flower_offload offload = {0}; struct tc_cls_flower_offload offload = {0};
@@ -188,7 +188,7 @@ static void fl_hw_replace_filter(struct tcf_proto *tp,
struct fl_flow_key *mask, struct fl_flow_key *mask,
struct fl_flow_key *key, struct fl_flow_key *key,
struct tcf_exts *actions, struct tcf_exts *actions,
u64 cookie, u32 flags) unsigned long cookie, u32 flags)
{ {
struct net_device *dev = tp->q->dev_queue->dev; struct net_device *dev = tp->q->dev_queue->dev;
struct tc_cls_flower_offload offload = {0}; struct tc_cls_flower_offload offload = {0};
@@ -219,7 +219,7 @@ static bool fl_destroy(struct tcf_proto *tp, bool force)
return false; return false;
list_for_each_entry_safe(f, next, &head->filters, list) { list_for_each_entry_safe(f, next, &head->filters, list) {
fl_hw_destroy_filter(tp, (u64)f); fl_hw_destroy_filter(tp, (unsigned long)f);
list_del_rcu(&f->list); list_del_rcu(&f->list);
call_rcu(&f->rcu, fl_destroy_filter); call_rcu(&f->rcu, fl_destroy_filter);
} }
@@ -554,13 +554,13 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
&mask.key, &mask.key,
&fnew->key, &fnew->key,
&fnew->exts, &fnew->exts,
(u64)fnew, (unsigned long)fnew,
flags); flags);
if (fold) { if (fold) {
rhashtable_remove_fast(&head->ht, &fold->ht_node, rhashtable_remove_fast(&head->ht, &fold->ht_node,
head->ht_params); head->ht_params);
fl_hw_destroy_filter(tp, (u64)fold); fl_hw_destroy_filter(tp, (unsigned long)fold);
} }
*arg = (unsigned long) fnew; *arg = (unsigned long) fnew;
@@ -588,7 +588,7 @@ static int fl_delete(struct tcf_proto *tp, unsigned long arg)
rhashtable_remove_fast(&head->ht, &f->ht_node, rhashtable_remove_fast(&head->ht, &f->ht_node,
head->ht_params); head->ht_params);
list_del_rcu(&f->list); list_del_rcu(&f->list);
fl_hw_destroy_filter(tp, (u64)f); fl_hw_destroy_filter(tp, (unsigned long)f);
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
call_rcu(&f->rcu, fl_destroy_filter); call_rcu(&f->rcu, fl_destroy_filter);
return 0; return 0;