Commit a102c897 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Paolo Abeni

net: sched: remove redundant NULL check in change hook function

Currently, the change function can be called by two ways. The one way is
that qdisc_change() will call it. Before calling change function,
qdisc_change() ensures tca[TCA_OPTIONS] is not empty. The other way is
that .init() will call it. The opt parameter is also checked before
calling change function in .init(). Therefore, it's no need to check the
input parameter opt in change function.
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Link: https://lore.kernel.org/r/20220829071219.208646-1-shaozhengchao@huawei.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 0e4d3547
...@@ -2569,9 +2569,6 @@ static int cake_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -2569,9 +2569,6 @@ static int cake_change(struct Qdisc *sch, struct nlattr *opt,
struct nlattr *tb[TCA_CAKE_MAX + 1]; struct nlattr *tb[TCA_CAKE_MAX + 1];
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_CAKE_MAX, opt, cake_policy, err = nla_parse_nested_deprecated(tb, TCA_CAKE_MAX, opt, cake_policy,
extack); extack);
if (err < 0) if (err < 0)
......
...@@ -138,9 +138,6 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -138,9 +138,6 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt,
unsigned int qlen, dropped = 0; unsigned int qlen, dropped = 0;
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_CODEL_MAX, opt, err = nla_parse_nested_deprecated(tb, TCA_CODEL_MAX, opt,
codel_policy, NULL); codel_policy, NULL);
if (err < 0) if (err < 0)
......
...@@ -594,11 +594,6 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -594,11 +594,6 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,
unsigned int i; unsigned int i;
int err; int err;
if (!opt) {
NL_SET_ERR_MSG(extack, "ETS options are required for this operation");
return -EINVAL;
}
err = nla_parse_nested(tb, TCA_ETS_MAX, opt, ets_policy, extack); err = nla_parse_nested(tb, TCA_ETS_MAX, opt, ets_policy, extack);
if (err < 0) if (err < 0)
return err; return err;
......
...@@ -808,9 +808,6 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -808,9 +808,6 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt,
unsigned drop_len = 0; unsigned drop_len = 0;
u32 fq_log; u32 fq_log;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_FQ_MAX, opt, fq_policy, err = nla_parse_nested_deprecated(tb, TCA_FQ_MAX, opt, fq_policy,
NULL); NULL);
if (err < 0) if (err < 0)
......
...@@ -372,9 +372,6 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -372,9 +372,6 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt,
u32 quantum = 0; u32 quantum = 0;
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_FQ_CODEL_MAX, opt, err = nla_parse_nested_deprecated(tb, TCA_FQ_CODEL_MAX, opt,
fq_codel_policy, NULL); fq_codel_policy, NULL);
if (err < 0) if (err < 0)
......
...@@ -283,9 +283,6 @@ static int fq_pie_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -283,9 +283,6 @@ static int fq_pie_change(struct Qdisc *sch, struct nlattr *opt,
unsigned int num_dropped = 0; unsigned int num_dropped = 0;
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested(tb, TCA_FQ_PIE_MAX, opt, fq_pie_policy, extack); err = nla_parse_nested(tb, TCA_FQ_PIE_MAX, opt, fq_pie_policy, extack);
if (err < 0) if (err < 0)
return err; return err;
......
...@@ -648,9 +648,6 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -648,9 +648,6 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt,
u32 max_P; u32 max_P;
struct gred_sched_data *prealloc; struct gred_sched_data *prealloc;
if (opt == NULL)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_GRED_MAX, opt, gred_policy, err = nla_parse_nested_deprecated(tb, TCA_GRED_MAX, opt, gred_policy,
extack); extack);
if (err < 0) if (err < 0)
......
...@@ -1430,7 +1430,7 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt, ...@@ -1430,7 +1430,7 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt,
struct hfsc_sched *q = qdisc_priv(sch); struct hfsc_sched *q = qdisc_priv(sch);
struct tc_hfsc_qopt *qopt; struct tc_hfsc_qopt *qopt;
if (opt == NULL || nla_len(opt) < sizeof(*qopt)) if (nla_len(opt) < sizeof(*qopt))
return -EINVAL; return -EINVAL;
qopt = nla_data(opt); qopt = nla_data(opt);
......
...@@ -516,9 +516,6 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -516,9 +516,6 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt,
u32 new_quantum = q->quantum; u32 new_quantum = q->quantum;
u32 new_hhf_non_hh_weight = q->hhf_non_hh_weight; u32 new_hhf_non_hh_weight = q->hhf_non_hh_weight;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_HHF_MAX, opt, hhf_policy, err = nla_parse_nested_deprecated(tb, TCA_HHF_MAX, opt, hhf_policy,
NULL); NULL);
if (err < 0) if (err < 0)
......
...@@ -961,9 +961,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -961,9 +961,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt,
int old_loss_model = CLG_RANDOM; int old_loss_model = CLG_RANDOM;
int ret; int ret;
if (opt == NULL)
return -EINVAL;
qopt = nla_data(opt); qopt = nla_data(opt);
ret = parse_attr(tb, TCA_NETEM_MAX, opt, netem_policy, sizeof(*qopt)); ret = parse_attr(tb, TCA_NETEM_MAX, opt, netem_policy, sizeof(*qopt));
if (ret < 0) if (ret < 0)
......
...@@ -143,9 +143,6 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -143,9 +143,6 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt,
unsigned int qlen, dropped = 0; unsigned int qlen, dropped = 0;
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_PIE_MAX, opt, pie_policy, err = nla_parse_nested_deprecated(tb, TCA_PIE_MAX, opt, pie_policy,
NULL); NULL);
if (err < 0) if (err < 0)
......
...@@ -161,9 +161,6 @@ static int plug_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -161,9 +161,6 @@ static int plug_change(struct Qdisc *sch, struct nlattr *opt,
struct plug_sched_data *q = qdisc_priv(sch); struct plug_sched_data *q = qdisc_priv(sch);
struct tc_plug_qopt *msg; struct tc_plug_qopt *msg;
if (opt == NULL)
return -EINVAL;
msg = nla_data(opt); msg = nla_data(opt);
if (nla_len(opt) < sizeof(*msg)) if (nla_len(opt) < sizeof(*msg))
return -EINVAL; return -EINVAL;
......
...@@ -368,9 +368,6 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -368,9 +368,6 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt,
struct nlattr *tb[TCA_RED_MAX + 1]; struct nlattr *tb[TCA_RED_MAX + 1];
int err; int err;
if (!opt)
return -EINVAL;
err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy, err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy,
extack); extack);
if (err < 0) if (err < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment