diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-12-23 08:12:15 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-12-23 08:12:15 +0000 |
| commit | 3969ccfde44258a7d158be8a789ae64adab7e76f (patch) | |
| tree | 20c5f25d2fbe63c4be17708bc65e6081d931da83 /target/linux/generic-2.6 | |
| parent | 917f4cf2a59283783be5b9a37a42226e4bffb448 (diff) | |
| download | mtk-20170518-3969ccfde44258a7d158be8a789ae64adab7e76f.zip mtk-20170518-3969ccfde44258a7d158be8a789ae64adab7e76f.tar.gz mtk-20170518-3969ccfde44258a7d158be8a789ae64adab7e76f.tar.bz2 | |
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')
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 a3c0262..3f66e2c 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 f9ce66e..5e2bfba 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 f72c0e3..bf123ce 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 fb28e90..f3636e6 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 fb28e90..f3636e6 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. |