diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-23 20:33:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:18 -0800 |
| commit | cee63723b358e594225e812d6e14a2a0abfd5c88 (patch) | |
| tree | 847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/sch_tbf.c | |
| parent | ab27cfb85c5778400740ad0c401bde65616774eb (diff) | |
| download | op-kernel-dev-cee63723b358e594225e812d6e14a2a0abfd5c88.zip op-kernel-dev-cee63723b358e594225e812d6e14a2a0abfd5c88.tar.gz | |
[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 6c4ad7e..f9b1543 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) static int tbf_change(struct Qdisc* sch, struct nlattr *opt) { - int err = -EINVAL; + int err; struct tbf_sched_data *q = qdisc_priv(sch); struct nlattr *tb[TCA_TBF_PTAB + 1]; struct tc_tbf_qopt *qopt; @@ -281,8 +281,12 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt) struct Qdisc *child = NULL; int max_size,n; - if (nla_parse_nested(tb, TCA_TBF_PTAB, opt, NULL) || - tb[TCA_TBF_PARMS] == NULL || + err = nla_parse_nested(tb, TCA_TBF_PTAB, opt, NULL); + if (err < 0) + return err; + + err = -EINVAL; + if (tb[TCA_TBF_PARMS] == NULL || nla_len(tb[TCA_TBF_PARMS]) < sizeof(*qopt)) goto done; |
