summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-23 08:12:15 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-23 08:12:15 +0000
commit07537ed74301efdc7c26faf1acb4aa175c463696 (patch)
tree7f49e5e84929fcf780c535164e637370d94f4cb8 /target/linux
parent3d6aff3290cc1ca7404c938863d9dc3d6446be78 (diff)
[target] 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)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18900 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch4
5 files changed, 15 insertions, 5 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 a3c02625d..3f66e2c67 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.
diff --git a/target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch
index f9ce66efc..5e2bfba45 100644
--- a/target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/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.
diff --git a/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch
index f72c0e370..bf123ce78 100644
--- a/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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,700 @@
+@@ -0,0 +1,702 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
+ *
@@ -144,7 +144,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.
diff --git a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
index fb28e9085..f3636e652 100644
--- a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/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,700 @@
+@@ -0,0 +1,702 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
+ *
@@ -144,7 +144,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.
diff --git a/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch
index fb28e9085..f3636e652 100644
--- a/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/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,700 @@
+@@ -0,0 +1,702 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
+ *
@@ -144,7 +144,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.