Bläddra i källkod

pkt_sched: Never schedule non-root qdiscs.

Based upon initial discovery and patch by Jarek Poplawski.

The qdisc watchdogs can be attached to any qdisc, not just the root,
so make sure we schedule the correct one.

CBQ has a similar bug.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 17 år sedan
förälder
incheckning
8608db031b
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      net/sched/sch_api.c
  2. 1 1
      net/sched/sch_cbq.c

+ 1 - 1
net/sched/sch_api.c

@@ -426,7 +426,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
 
 
 	wd->qdisc->flags &= ~TCQ_F_THROTTLED;
 	wd->qdisc->flags &= ~TCQ_F_THROTTLED;
 	smp_wmb();
 	smp_wmb();
-	__netif_schedule(wd->qdisc);
+	__netif_schedule(qdisc_root(wd->qdisc));
 
 
 	return HRTIMER_NORESTART;
 	return HRTIMER_NORESTART;
 }
 }

+ 1 - 1
net/sched/sch_cbq.c

@@ -654,7 +654,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
 	}
 	}
 
 
 	sch->flags &= ~TCQ_F_THROTTLED;
 	sch->flags &= ~TCQ_F_THROTTLED;
-	__netif_schedule(sch);
+	__netif_schedule(qdisc_root(sch));
 	return HRTIMER_NORESTART;
 	return HRTIMER_NORESTART;
 }
 }