From: Felix Fietkau Date: Sat, 18 Jul 2009 20:31:21 +0000 (+0000) Subject: sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config... X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf2c544844f71628a81823af2af2f6ec7d4a082a;p=librecmc%2Flibrecmc.git sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config (#5553) 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 a9bdb06f84..90773f7045 100644 --- 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 70718e7526..ad9e9badd3 100644 --- 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