summaryrefslogtreecommitdiff
path: root/net/sched/police.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-30 22:33:26 +0400
committerSteve French <sfrench@us.ibm.com>2005-08-30 22:33:26 +0400
commit2016ef789a9ded2e169ad1c028ae3deb5302571f (patch)
tree601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/sched/police.c
parent7f57356b70dda014ef269135942426e4a852023e (diff)
parent6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff)
downloadlinux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/sched/police.c')
-rw-r--r--net/sched/police.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/police.c b/net/sched/police.c
index c03545faf523..eb39fb2f39b6 100644
--- 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;