merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 260-extend_pfifo_fast.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
index 70718e7..ad9e9ba 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
@@ -123,11 +123,12 @@
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .peek           =       pfifo_fast_peek,
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .peek           =       pfifo_fast_peek,

-@@ -735,3 +799,16 @@ void dev_shutdown(struct net_device *dev
+@@ -735,3 +799,18 @@ void dev_shutdown(struct net_device *dev

        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +
        shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
        WARN_ON(timer_pending(&dev->watchdog_timer));
  }
 +

++#ifdef CONFIG_NET_SCHED

 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);
 +static int __init sch_generic_init(void)
 +{
 +      return register_qdisc(&pfifo_fast_ops);


@@ -140,3 +141,4 @@
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)

++#endif