diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /net/sched/cls_rsvp.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'net/sched/cls_rsvp.h')
| -rw-r--r-- | net/sched/cls_rsvp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h index 006168d69376..572f06be3b02 100644 --- a/net/sched/cls_rsvp.h +++ b/net/sched/cls_rsvp.h | |||
| @@ -555,8 +555,7 @@ insert: | |||
| 555 | goto insert; | 555 | goto insert; |
| 556 | 556 | ||
| 557 | errout: | 557 | errout: |
| 558 | if (f) | 558 | kfree(f); |
| 559 | kfree(f); | ||
| 560 | errout2: | 559 | errout2: |
| 561 | tcf_exts_destroy(tp, &e); | 560 | tcf_exts_destroy(tp, &e); |
| 562 | return err; | 561 | return err; |