diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-08-29 23:21:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 23:27:52 +0200 |
| commit | 102396ae65108b026e4e1868e30fa013f45a169e (patch) | |
| tree | 1164f9020a3fa47460a2ab72e07c3308be2290ee /net/sched/cls_route.c | |
| parent | ipv6: When we droped a packet, we should return NET_RX_DROP instead of 0 (diff) | |
| download | linux-102396ae65108b026e4e1868e30fa013f45a169e.tar.xz linux-102396ae65108b026e4e1868e30fa013f45a169e.zip | |
pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock()
Use qdisc_root_sleeping_lock() instead of qdisc_root_lock() where
appropriate. The only difference is while dev is deactivated, when
currently we can use a sleeping qdisc with the lock of noop_qdisc.
This shouldn't be dangerous since after deactivation root lock could
be used only by gen_estimator code, but looks wrong anyway.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_route.c')
| -rw-r--r-- | net/sched/cls_route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 481260a4f10f..e3d8455eebc2 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c @@ -75,7 +75,7 @@ static __inline__ int route4_fastmap_hash(u32 id, int iif) static inline void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id) { - spinlock_t *root_lock = qdisc_root_lock(q); + spinlock_t *root_lock = qdisc_root_sleeping_lock(q); spin_lock_bh(root_lock); memset(head->fastmap, 0, sizeof(head->fastmap)); |