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
2009-12-23 08:12:15 +00:00 · 2009-12-23 08:12:15 +00:00 · 3969ccfde4
commit 3969ccfde4
parent 917f4cf2a5
5 changed files with 15 additions and 5 deletions
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.