diff options
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 9a3449b56bd6..2a76a2f5ed88 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -267,7 +267,8 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle)  	    root->handle == handle)  		return root; -	hash_for_each_possible_rcu(qdisc_dev(root)->qdisc_hash, q, hash, handle) { +	hash_for_each_possible_rcu(qdisc_dev(root)->qdisc_hash, q, hash, handle, +				   lockdep_rtnl_is_held()) {  		if (q->handle == handle)  			return q;  	} @@ -1093,8 +1094,7 @@ skip:  		int err;  		/* Only support running class lockless if parent is lockless */ -		if (new && (new->flags & TCQ_F_NOLOCK) && -		    parent && !(parent->flags & TCQ_F_NOLOCK)) +		if (new && (new->flags & TCQ_F_NOLOCK) && !(parent->flags & TCQ_F_NOLOCK))  			qdisc_clear_nolock(new);  		if (!cops || !cops->graft)  | 
