Commit 74e3be60 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: use tcf_block_q helper to get q pointer for sch_tree_lock 



Use tcf_block_q helper to get q pointer to be used for direct call of
sch_tree_lock/unlock instead of tcf_tree_lock/unlock.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1abf2720

include/net/sch_generic.h

+0 −3
Original line number Diff line number Diff line
@@ -359,9 +359,6 @@ static inline void sch_tree_unlock(const struct Qdisc *q) 
	spin_unlock_bh(qdisc_root_sleeping_lock(q));

}



#define tcf_tree_lock(tp)	sch_tree_lock((tp)->q)

#define tcf_tree_unlock(tp)	sch_tree_unlock((tp)->q)



extern struct Qdisc noop_qdisc;

extern struct Qdisc_ops noop_qdisc_ops;

extern struct Qdisc_ops pfifo_fast_ops;

net/sched/sch_api.c

+4 −2
Original line number Diff line number Diff line
@@ -1661,9 +1661,11 @@ static int tcf_node_bind(struct tcf_proto *tp, void *n, struct tcf_walker *arg) 
	struct tcf_bind_args *a = (void *)arg;



	if (tp->ops->bind_class) {

		tcf_tree_lock(tp);

		struct Qdisc *q = tcf_block_q(tp->chain->block);



		sch_tree_lock(q);

		tp->ops->bind_class(n, a->classid, a->cl);

		tcf_tree_unlock(tp);

		sch_tree_unlock(q);

	}

	return 0;

}