diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
| commit | e7874c996b8591f59d78efa519031dab5b58723b (patch) | |
| tree | 14aa8dea0c33de9d22ef8177fb242c9d80d693de /net/sched | |
| parent | 4a6346d4ea63b5e1390babf22f1cc0f113d8082b (diff) | |
| parent | 736d58e3a2245ac2779fe0f278f8735bcf33ca8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
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 03f80a0fa16..1f9595467c1 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)) |