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/em_meta.c | |
| 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/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index cf68a59fdc5a..700844d49d79 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
| @@ -561,8 +561,7 @@ static int meta_var_change(struct meta_value *dst, struct rtattr *rta) | |||
| 561 | 561 | ||
| 562 | static void meta_var_destroy(struct meta_value *v) | 562 | static void meta_var_destroy(struct meta_value *v) |
| 563 | { | 563 | { |
| 564 | if (v->val) | 564 | kfree((void *) v->val); |
| 565 | kfree((void *) v->val); | ||
| 566 | } | 565 | } |
| 567 | 566 | ||
| 568 | static void meta_var_apply_extras(struct meta_value *v, | 567 | static void meta_var_apply_extras(struct meta_value *v, |