diff options
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r-- | net/sched/sch_generic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index cc17e794c41e..0da09d508737 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -527,6 +527,8 @@ static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt) | |||
527 | for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) | 527 | for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) |
528 | skb_queue_head_init(band2list(priv, prio)); | 528 | skb_queue_head_init(band2list(priv, prio)); |
529 | 529 | ||
530 | /* Can by-pass the queue discipline */ | ||
531 | qdisc->flags |= TCQ_F_CAN_BYPASS; | ||
530 | return 0; | 532 | return 0; |
531 | } | 533 | } |
532 | 534 | ||
@@ -691,9 +693,6 @@ static void attach_one_default_qdisc(struct net_device *dev, | |||
691 | netdev_info(dev, "activation failed\n"); | 693 | netdev_info(dev, "activation failed\n"); |
692 | return; | 694 | return; |
693 | } | 695 | } |
694 | |||
695 | /* Can by-pass the queue discipline for default qdisc */ | ||
696 | qdisc->flags |= TCQ_F_CAN_BYPASS; | ||
697 | } | 696 | } |
698 | dev_queue->qdisc_sleeping = qdisc; | 697 | dev_queue->qdisc_sleeping = qdisc; |
699 | } | 698 | } |