aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_api.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 20:33:13 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 20:33:13 -0400
commit555353cfa1aee293de445bfa6de43276138ddd82 (patch)
treeb5daba85806b8e36731c4a474aac97f1a0140a51 /net/sched/sch_api.c
parentdc2b48475a0a36f8b3bbb2da60d3a006dc5c2c84 (diff)
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.c3
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,
601 601
602 sch->parent = parent; 602 sch->parent = parent;
603 603
604 sch->stats_lock = &dev_queue->lock;
604 if (handle == TC_H_INGRESS) { 605 if (handle == TC_H_INGRESS) {
605 sch->flags |= TCQ_F_INGRESS; 606 sch->flags |= TCQ_F_INGRESS;
606 sch->stats_lock = &dev->ingress_lock;
607 handle = TC_H_MAKE(TC_H_INGRESS, 0); 607 handle = TC_H_MAKE(TC_H_INGRESS, 0);
608 } else { 608 } else {
609 sch->stats_lock = &dev_queue->lock;
610 if (handle == 0) { 609 if (handle == 0) {
611 handle = qdisc_alloc_handle(dev); 610 handle = qdisc_alloc_handle(dev);
612 err = -ENOMEM; 611 err = -ENOMEM;