diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-08 17:33:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 17:33:13 -0700 |
| commit | 555353cfa1aee293de445bfa6de43276138ddd82 (patch) | |
| tree | b5daba85806b8e36731c4a474aac97f1a0140a51 /net/sched/sch_api.c | |
| parent | dc2b48475a0a36f8b3bbb2da60d3a006dc5c2c84 (diff) | |
| download | blackbird-op-linux-555353cfa1aee293de445bfa6de43276138ddd82.tar.gz blackbird-op-linux-555353cfa1aee293de445bfa6de43276138ddd82.zip | |
netdev: The ingress_lock member is no longer needed.
Every qdisc is assosciated with a queue, and in the case of ingress
qdiscs that will now be netdev->rx_queue so using that queue's lock is
the thing to do.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 2a1834f8c7d8..570cef2a9c5f 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -601,12 +601,11 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, sch->parent = parent; + sch->stats_lock = &dev_queue->lock; if (handle == TC_H_INGRESS) { sch->flags |= TCQ_F_INGRESS; - sch->stats_lock = &dev->ingress_lock; handle = TC_H_MAKE(TC_H_INGRESS, 0); } else { - sch->stats_lock = &dev_queue->lock; if (handle == 0) { handle = qdisc_alloc_handle(dev); err = -ENOMEM; |
