aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-07-18 20:31:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-07-18 20:31:21 +0000
commit1864d58c3deb11e41e944ea3faaee45556323854 (patch)
tree3c2bf4ef05fd9b06e1193b9e7c97f78e24a6682f
parent48b4787ea0c8a4975b6d29f8668b70f64c0e41e2 (diff)
downloadupstream-1864d58c3deb11e41e944ea3faaee45556323854.tar.gz
upstream-1864d58c3deb11e41e944ea3faaee45556323854.tar.bz2
upstream-1864d58c3deb11e41e944ea3faaee45556323854.zip
sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config (#5553)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16903 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/260-extend_pfifo_fast.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch4
2 files changed, 6 insertions, 2 deletions
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