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

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

net_sched: sch_fq: use rb_entry() 



To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7fb1383

net/sched/sch_fq.c

+7 −7
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void fq_flow_set_throttled(struct fq_sched_data *q, struct fq_flow *f) 
		struct fq_flow *aux;



		parent = *p;

		aux = container_of(parent, struct fq_flow, rate_node);

		aux = rb_entry(parent, struct fq_flow, rate_node);

		if (f->time_next_packet >= aux->time_next_packet)

			p = &parent->rb_right;

		else
@@ -188,7 +188,7 @@ static void fq_gc(struct fq_sched_data *q, 
	while (*p) {

		parent = *p;



		f = container_of(parent, struct fq_flow, fq_node);

		f = rb_entry(parent, struct fq_flow, fq_node);

		if (f->sk == sk)

			break;
@@ -256,7 +256,7 @@ static struct fq_flow *fq_classify(struct sk_buff *skb, struct fq_sched_data *q) 
	while (*p) {

		parent = *p;



		f = container_of(parent, struct fq_flow, fq_node);

		f = rb_entry(parent, struct fq_flow, fq_node);

		if (f->sk == sk) {

			/* socket might have been reallocated, so check

			 * if its sk_hash is the same.
@@ -424,7 +424,7 @@ static void fq_check_throttled(struct fq_sched_data *q, u64 now) 


	q->time_next_delayed_flow = ~0ULL;

	while ((p = rb_first(&q->delayed)) != NULL) {

		struct fq_flow *f = container_of(p, struct fq_flow, rate_node);

		struct fq_flow *f = rb_entry(p, struct fq_flow, rate_node);



		if (f->time_next_packet > now) {

			q->time_next_delayed_flow = f->time_next_packet;
@@ -563,7 +563,7 @@ static void fq_reset(struct Qdisc *sch) 
	for (idx = 0; idx < (1U << q->fq_trees_log); idx++) {

		root = &q->fq_root[idx];

		while ((p = rb_first(root)) != NULL) {

			f = container_of(p, struct fq_flow, fq_node);

			f = rb_entry(p, struct fq_flow, fq_node);

			rb_erase(p, root);



			fq_flow_purge(f);
@@ -593,7 +593,7 @@ static void fq_rehash(struct fq_sched_data *q, 
		oroot = &old_array[idx];

		while ((op = rb_first(oroot)) != NULL) {

			rb_erase(op, oroot);

			of = container_of(op, struct fq_flow, fq_node);

			of = rb_entry(op, struct fq_flow, fq_node);

			if (fq_gc_candidate(of)) {

				fcnt++;

				kmem_cache_free(fq_flow_cachep, of);
@@ -606,7 +606,7 @@ static void fq_rehash(struct fq_sched_data *q, 
			while (*np) {

				parent = *np;



				nf = container_of(parent, struct fq_flow, fq_node);

				nf = rb_entry(parent, struct fq_flow, fq_node);

				BUG_ON(nf->sk == of->sk);



				if (nf->sk > of->sk)