diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /net/sched | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 792ce59940ec..2ffa11c6e8de 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -707,7 +707,7 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event, | |||
| 707 | 707 | ||
| 708 | rtattr_failure: | 708 | rtattr_failure: |
| 709 | nlmsg_failure: | 709 | nlmsg_failure: |
| 710 | skb_trim(skb, b - skb->data); | 710 | kfree_skb(skb); |
| 711 | return -1; | 711 | return -1; |
| 712 | } | 712 | } |
| 713 | 713 | ||