lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET_SCHED]: sch_netem: use nla_parse_nested_compat

Browse Source 
Replace open coded equivalent of nla_parse_nested_compat().

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2008-01-23 20:32:21 -08:00
committed by David S. Miller
parent f5e5cb7553
commit b03f467200
1 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/sched/sch_netem.c
View File

@@ -407,13 +407,18 @@ static int get_corrupt(struct Qdisc *sch, const struct nlattr *attr)
static int netem_change(struct Qdisc *sch, struct nlattr *opt) static int netem_change(struct Qdisc *sch, struct nlattr *opt)
{ {
struct netem_sched_data *q = qdisc_priv(sch); struct netem_sched_data *q = qdisc_priv(sch);
struct nlattr *tb[TCA_NETEM_MAX + 1];
struct tc_netem_qopt *qopt; struct tc_netem_qopt *qopt;
int ret; int ret;
if (opt == NULL || nla_len(opt) < sizeof(*qopt)) if (opt == NULL)
return -EINVAL; return -EINVAL;
qopt = nla_data(opt); ret = nla_parse_nested_compat(tb, TCA_NETEM_MAX, opt, NULL, qopt,
sizeof(*qopt));
if (ret < 0)
return ret;
ret = set_fifo_limit(q->qdisc, qopt->limit); ret = set_fifo_limit(q->qdisc, qopt->limit);
if (ret) { if (ret) {
pr_debug("netem: can't set fifo limit\n"); pr_debug("netem: can't set fifo limit\n");
@@ -434,16 +439,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt)
if (q->gap) if (q->gap)
q->reorder = ~0; q->reorder = ~0;
/* Handle nested options after initial queue options.
* Should have put all options in nested format but too late now.
*/
if (nla_len(opt) > sizeof(*qopt)) {
struct nlattr *tb[TCA_NETEM_MAX + 1];
if (nla_parse(tb, TCA_NETEM_MAX,
nla_data(opt) + sizeof(*qopt),
nla_len(opt) - sizeof(*qopt), NULL))
return -EINVAL;
if (tb[TCA_NETEM_CORR]) { if (tb[TCA_NETEM_CORR]) {
ret = get_correlation(sch, tb[TCA_NETEM_CORR]); ret = get_correlation(sch, tb[TCA_NETEM_CORR]);
if (ret) if (ret)
@@ -467,7 +462,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt)
if (ret) if (ret)
return ret; return ret;
} }
}
return 0; return 0;
} }