aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-12-23 08:12:15 +0000
committerNicolas Thill <nico@openwrt.org>2009-12-23 08:12:15 +0000
commit3969ccfde44258a7d158be8a789ae64adab7e76f (patch)
tree20c5f25d2fbe63c4be17708bc65e6081d931da83 /target/linux/generic-2.6/patches-2.6.25
parent917f4cf2a59283783be5b9a37a42226e4bffb448 (diff)
downloadupstream-3969ccfde44258a7d158be8a789ae64adab7e76f.tar.gz
upstream-3969ccfde44258a7d158be8a789ae64adab7e76f.tar.bz2
upstream-3969ccfde44258a7d158be8a789ae64adab7e76f.zip
generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_NET_SCH_ESFQ_NFCT is set (fixes build failure on target where CONFIG_NETFILTER is not set)
SVN-Revision: 18900
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
index a3c02625d9..3f66e2c674 100644
--- a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
@@ -90,7 +90,7 @@
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
+@@ -0,0 +1,704 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
+ *
@@ -143,7 +143,9 @@
+#include <net/sock.h>
+#include <net/pkt_sched.h>
+#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.