summaryrefslogtreecommitdiff
path: root/net/sched/gact.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/gact.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/gact.c')
-rw-r--r--net/sched/gact.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/gact.c b/net/sched/gact.c
index a811c89fef7f..d1c6d542912a 100644
--- a/net/sched/gact.c
+++ b/net/sched/gact.c
@@ -135,7 +135,7 @@ tcf_gact_cleanup(struct tc_action *a, int bind)
}
static int
-tcf_gact(struct sk_buff **pskb, struct tc_action *a)
+tcf_gact(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
{
struct tcf_gact *p = PRIV(a, gact);
struct sk_buff *skb = *pskb;