Re: qdisc and down links (regression)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <stephen.hemminger@...>
Cc: <netdev@...>, <linux-kernel@...>
Date: Thursday, August 7, 2008 - 9:50 pm

From: David Miller <davem@davemloft.net>
Date: Thu, 07 Aug 2008 15:47:35 -0700 (PDT)


This should fix it, let me know if it doesn't:

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 83b23b5..ba1d121 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -189,7 +189,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
 
 	for (i = 0; i < dev->num_tx_queues; i++) {
 		struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-		struct Qdisc *q, *txq_root = txq->qdisc;
+		struct Qdisc *q, *txq_root = txq->qdisc_sleeping;
 
 		if (!(txq_root->flags & TCQ_F_BUILTIN) &&
 		    txq_root->handle == handle)
@@ -793,7 +793,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
 			}
 		}
 		if ((parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS))
-			list_add_tail(&sch->list, &dev_queue->qdisc->list);
+			list_add_tail(&sch->list, &dev_queue->qdisc_sleeping->list);
 
 		return sch;
 	}
@@ -1236,11 +1236,11 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
 		q_idx = 0;
 
 		dev_queue = netdev_get_tx_queue(dev, 0);
-		if (tc_dump_qdisc_root(dev_queue->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
+		if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
 			goto done;
 
 		dev_queue = &dev->rx_queue;
-		if (tc_dump_qdisc_root(dev_queue->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
+		if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
 			goto done;
 
 cont:
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
qdisc and down links (regression), Stephen Hemminger, (Thu Aug 7, 5:30 pm)
Re: qdisc and down links (regression), David Miller, (Thu Aug 7, 6:47 pm)
Re: qdisc and down links (regression), David Miller, (Thu Aug 7, 9:50 pm)
Re: qdisc and down links (regression), Stephen Hemminger, (Fri Aug 8, 5:32 pm)
Re: qdisc and down links (regression), David Miller, (Sat Aug 9, 2:24 am)
Re: qdisc and down links (regression), Stephen Hemminger, (Mon Aug 11, 1:34 pm)
Re: qdisc and down links (regression), David Miller, (Fri Aug 8, 7:11 pm)
Re: qdisc and down links (regression), Stephen Hemminger, (Fri Aug 8, 7:12 pm)