aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commitcf2c544844f71628a81823af2af2f6ec7d4a082a (patch)
tree99da290e0f36d20a06a7dffe4e378a4156a8c9e1 /target/linux
parentbab4138b4afba954c58e05b296887d4b77b81dbf (diff)
downloadupstream-cf2c544844f71628a81823af2af2f6ec7d4a082a.tar.gz
upstream-cf2c544844f71628a81823af2af2f6ec7d4a082a.tar.bz2
upstream-cf2c544844f71628a81823af2af2f6ec7d4a082a.zip
sched: fix compile errors with CONFIG_NET_SCHED deactivated in the kernel config (#5553)
SVN-Revision: 16903
Diffstat (limited to 'target/linux')
-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