diff options
author | Patrick McHardy <kaber@trash.net> | 2010-05-11 18:59:21 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-05-11 18:59:21 +0200 |
commit | cba7a98a474a4f2a9316473734ba76829191a78a (patch) | |
tree | 28a0ab87dba93385353bedb76a26a1fc45b3a0c6 /net/sched | |
parent | d250fe91ae129bff0968e685cc9c466d3a5e3482 (diff) | |
parent | 4538506be386f9736b83bf9892f829adbbb70fea (diff) | |
download | op-kernel-dev-cba7a98a474a4f2a9316473734ba76829191a78a.zip op-kernel-dev-cba7a98a474a4f2a9316473734ba76829191a78a.tar.gz |
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/act_ipt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 03f80a0..1f95954 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -199,7 +199,7 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a, { int ret = 0, result = 0; struct tcf_ipt *ipt = a->priv; - struct xt_target_param par; + struct xt_action_param par; if (skb_cloned(skb)) { if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) |