Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255f4803 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: sched: gred: separate error and non-error path in gred_change() 



We will soon want to add more code to the non-error path, separate
it from the error handling flow.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJohn Hurley <john.hurley@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c549a6b

net/sched/sch_gred.c

+6 −6
Original line number Diff line number Diff line
@@ -423,12 +423,11 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt, 


	max_P = tb[TCA_GRED_MAX_P] ? nla_get_u32(tb[TCA_GRED_MAX_P]) : 0;



	err = -EINVAL;

	ctl = nla_data(tb[TCA_GRED_PARMS]);

	stab = nla_data(tb[TCA_GRED_STAB]);



	if (ctl->DP >= table->DPs)

		goto errout;

		return -EINVAL;



	if (gred_rio_mode(table)) {

		if (ctl->prio == 0) {
@@ -450,7 +449,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt, 


	err = gred_change_vq(sch, ctl->DP, ctl, prio, stab, max_P, &prealloc);

	if (err < 0)

		goto errout_locked;

		goto err_unlock_free;



	if (gred_rio_mode(table)) {

		gred_disable_wred_mode(table);
@@ -458,12 +457,13 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt, 
			gred_enable_wred_mode(table);

	}



	err = 0;

	sch_tree_unlock(sch);

	kfree(prealloc);

	return 0;



errout_locked:

err_unlock_free:

	sch_tree_unlock(sch);

	kfree(prealloc);

errout:

	return err;

}