diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
| commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
| tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /net/sched/sch_netem.c | |
| parent | 143b11c03cd42f2284efe5128afc057d8fc86c78 (diff) | |
| parent | 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index fb0294d0b55e..3781e55046d0 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -341,7 +341,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) for (i = 0; i < n; i++) d->table[i] = data[i]; - root_lock = qdisc_root_lock(sch); + root_lock = qdisc_root_sleeping_lock(sch); spin_lock_bh(root_lock); d = xchg(&q->delay_dist, d); |