diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-23 23:33:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:18 -0500 |
commit | cee63723b358e594225e812d6e14a2a0abfd5c88 (patch) | |
tree | 847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/sch_tbf.c | |
parent | ab27cfb85c5778400740ad0c401bde65616774eb (diff) |
[NET_SCHED]: Propagate nla_parse return value
nla_parse() returns more detailed errno codes, propagate them back on
error.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_tbf.c')
-rw-r--r-- | net/sched/sch_tbf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index 6c4ad7e677b3..f9b1543e3d76 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
@@ -272,7 +272,7 @@ static struct Qdisc *tbf_create_dflt_qdisc(struct Qdisc *sch, u32 limit) | |||
272 | 272 | ||
273 | static int tbf_change(struct Qdisc* sch, struct nlattr *opt) | 273 | static int tbf_change(struct Qdisc* sch, struct nlattr *opt) |
274 | { | 274 | { |
275 | int err = -EINVAL; | 275 | int err; |
276 | struct tbf_sched_data *q = qdisc_priv(sch); | 276 | struct tbf_sched_data *q = qdisc_priv(sch); |
277 | struct nlattr *tb[TCA_TBF_PTAB + 1]; | 277 | struct nlattr *tb[TCA_TBF_PTAB + 1]; |
278 | struct tc_tbf_qopt *qopt; | 278 | struct tc_tbf_qopt *qopt; |
@@ -281,8 +281,12 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt) | |||
281 | struct Qdisc *child = NULL; | 281 | struct Qdisc *child = NULL; |
282 | int max_size,n; | 282 | int max_size,n; |
283 | 283 | ||
284 | if (nla_parse_nested(tb, TCA_TBF_PTAB, opt, NULL) || | 284 | err = nla_parse_nested(tb, TCA_TBF_PTAB, opt, NULL); |
285 | tb[TCA_TBF_PARMS] == NULL || | 285 | if (err < 0) |
286 | return err; | ||
287 | |||
288 | err = -EINVAL; | ||
289 | if (tb[TCA_TBF_PARMS] == NULL || | ||
286 | nla_len(tb[TCA_TBF_PARMS]) < sizeof(*qopt)) | 290 | nla_len(tb[TCA_TBF_PARMS]) < sizeof(*qopt)) |
287 | goto done; | 291 | goto done; |
288 | 292 | ||