sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config...

SVN-Revision: 16903

diff --git a/target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch
index a9bdb06f84428459d99f3fa7d93a7f8437f75e79..90773f7045d12096e3776cebd545bbc992462e18 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch
@@ -123,11 +123,12 @@
        .enqueue        =       pfifo_fast_enqueue,
        .dequeue        =       pfifo_fast_dequeue,
        .requeue        =       pfifo_fast_requeue,
-@@ -739,3 +803,16 @@ void dev_shutdown(struct net_device *dev
+@@ -739,3 +803,18 @@ void dev_shutdown(struct net_device *dev
        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);
@@ -140,3 +141,4 @@
 +
 +module_init(sch_generic_init)
 +module_exit(sch_generic_exit)
++#endif

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 70718e7526aca813658cbb7cf2854cd5c6efa704..ad9e9badd3128ec35e96fda3a8367c299a747ce6 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,
-@@ -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));
  }
 +
++#ifdef CONFIG_NET_SCHED
 +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)
++#endif