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

Commit 3b1af93c authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

net_sched: use setup_deferrable_timer 



Use setup_deferrable_timer() instead of init_timer_deferrable() to
simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff41c7fa

net/sched/cls_flow.c

+2 −3
Original line number Diff line number Diff line
@@ -508,9 +508,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, 
		get_random_bytes(&fnew->hashrnd, 4);

	}



	fnew->perturb_timer.function = flow_perturbation;

	fnew->perturb_timer.data = (unsigned long)fnew;

	init_timer_deferrable(&fnew->perturb_timer);

	setup_deferrable_timer(&fnew->perturb_timer, flow_perturbation,

			       (unsigned long)fnew);



	tcf_exts_change(tp, &fnew->exts, &e);

	tcf_em_tree_change(tp, &fnew->ematches, &t);

net/sched/sch_sfq.c

+2 −3
Original line number Diff line number Diff line
@@ -714,9 +714,8 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt) 
	struct sfq_sched_data *q = qdisc_priv(sch);

	int i;



	q->perturb_timer.function = sfq_perturbation;

	q->perturb_timer.data = (unsigned long)sch;

	init_timer_deferrable(&q->perturb_timer);

	setup_deferrable_timer(&q->perturb_timer, sfq_perturbation,

			       (unsigned long)sch);



	for (i = 0; i < SFQ_MAX_DEPTH + 1; i++) {

		q->dep[i].next = i + SFQ_MAX_FLOWS;