diff --git a/[refs] b/[refs] index ccce5f55adef..68465e989b54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b99b7e90bf5cd9a88823c49574ba80d92a98262 +refs/heads/master: 624b85fb96206879c8146abdba071222bbd25259 diff --git a/trunk/net/sched/sch_qfq.c b/trunk/net/sched/sch_qfq.c index 489edd929932..39d85cc0db26 100644 --- a/trunk/net/sched/sch_qfq.c +++ b/trunk/net/sched/sch_qfq.c @@ -821,7 +821,7 @@ static void qfq_make_eligible(struct qfq_sched *q) unsigned long old_vslot = q->oldV >> q->min_slot_shift; if (vslot != old_vslot) { - unsigned long mask = (1UL << fls(vslot ^ old_vslot)) - 1; + unsigned long mask = (1ULL << fls(vslot ^ old_vslot)) - 1; qfq_move_groups(q, mask, IR, ER); qfq_move_groups(q, mask, IB, EB); }