projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
net
/
sched
/
police.c
diff --git
a/net/sched/police.c
b/net/sched/police.c
index
c03545f
..
eb39fb2
100644
(file)
--- a/
net/sched/police.c
+++ b/
net/sched/police.c
@@
-284,7
+284,8
@@
static int tcf_act_police_cleanup(struct tc_action *a, int bind)
return 0;
}
-static int tcf_act_police(struct sk_buff **pskb, struct tc_action *a)
+static int tcf_act_police(struct sk_buff **pskb, struct tc_action *a,
+ struct tcf_result *res)
{
psched_time_t now;
struct sk_buff *skb = *pskb;