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

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.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 0e4d3547

net/sched/sch_cake.c

+0 −3
Original line number Diff line number Diff line
@@ -2569,9 +2569,6 @@ static int cake_change(struct Qdisc *sch, struct nlattr *opt, 
	struct nlattr *tb[TCA_CAKE_MAX + 1];

	int err;



	if (!opt)

		return -EINVAL;



	err = nla_parse_nested_deprecated(tb, TCA_CAKE_MAX, opt, cake_policy,

					  extack);

	if (err < 0)

net/sched/sch_codel.c

+0 −3
Original line number Diff line number Diff line
@@ -138,9 +138,6 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt, 
	unsigned int qlen, dropped = 0;

	int err;



	if (!opt)

		return -EINVAL;



	err = nla_parse_nested_deprecated(tb, TCA_CODEL_MAX, opt,

					  codel_policy, NULL);

	if (err < 0)

net/sched/sch_ets.c

+0 −5
Original line number Diff line number Diff line
@@ -594,11 +594,6 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt, 
	unsigned int i;

	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);

	if (err < 0)

		return err;

net/sched/sch_fq.c

+0 −3
Original line number Diff line number Diff line
@@ -808,9 +808,6 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt, 
	unsigned drop_len = 0;

	u32 fq_log;



	if (!opt)

		return -EINVAL;



	err = nla_parse_nested_deprecated(tb, TCA_FQ_MAX, opt, fq_policy,

					  NULL);

	if (err < 0)

net/sched/sch_fq_codel.c

+0 −3
Original line number Diff line number Diff line
@@ -372,9 +372,6 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, 
	u32 quantum = 0;

	int err;



	if (!opt)

		return -EINVAL;



	err = nla_parse_nested_deprecated(tb, TCA_FQ_CODEL_MAX, opt,

					  fq_codel_policy, NULL);

	if (err < 0)