diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-11 12:59:21 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-11 12:59:21 -0400 |
| commit | cba7a98a474a4f2a9316473734ba76829191a78a (patch) | |
| tree | 28a0ab87dba93385353bedb76a26a1fc45b3a0c6 /net/sched | |
| parent | d250fe91ae129bff0968e685cc9c466d3a5e3482 (diff) | |
| parent | 4538506be386f9736b83bf9892f829adbbb70fea (diff) | |
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 03f80a0fa167..1f9595467c17 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, | |||
| 199 | { | 199 | { |
| 200 | int ret = 0, result = 0; | 200 | int ret = 0, result = 0; |
| 201 | struct tcf_ipt *ipt = a->priv; | 201 | struct tcf_ipt *ipt = a->priv; |
| 202 | struct xt_target_param par; | 202 | struct xt_action_param par; |
| 203 | 203 | ||
| 204 | if (skb_cloned(skb)) { | 204 | if (skb_cloned(skb)) { |
| 205 | if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) | 205 | if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) |