diff --git a/[refs] b/[refs] index a873d3951332..9fc235840596 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd96535b81ad09d7593cc75093534acb984d3dc9 +refs/heads/master: 8cbe1d46d69f9e2c49f284fe0e9aee3387bd2c71 diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c index 9a2f8e41a26e..87e48a4e1051 100644 --- a/trunk/net/sched/sch_generic.c +++ b/trunk/net/sched/sch_generic.c @@ -179,6 +179,7 @@ int qdisc_restart(struct net_device *dev) netif_schedule(dev); return 1; } + BUG_ON((int) q->q.qlen < 0); return q->q.qlen; }