mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-20 08:44:44 +02:00
[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
This commit is contained in:
parent
3d6aff3290
commit
07537ed743
@ -90,7 +90,7 @@
|
|||||||
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/sched/sch_esfq.c
|
+++ b/net/sched/sch_esfq.c
|
||||||
@@ -0,0 +1,702 @@
|
@@ -0,0 +1,704 @@
|
||||||
+/*
|
+/*
|
||||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||||
+ *
|
+ *
|
||||||
@ -143,7 +143,9 @@
|
|||||||
+#include <net/sock.h>
|
+#include <net/sock.h>
|
||||||
+#include <net/pkt_sched.h>
|
+#include <net/pkt_sched.h>
|
||||||
+#include <linux/jhash.h>
|
+#include <linux/jhash.h>
|
||||||
|
+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
|
||||||
+#include <net/netfilter/nf_conntrack.h>
|
+#include <net/netfilter/nf_conntrack.h>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Stochastic Fairness Queuing algorithm.
|
+/* Stochastic Fairness Queuing algorithm.
|
||||||
+ For more comments look at sch_sfq.c.
|
+ For more comments look at sch_sfq.c.
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/sched/sch_esfq.c
|
+++ b/net/sched/sch_esfq.c
|
||||||
@@ -0,0 +1,702 @@
|
@@ -0,0 +1,704 @@
|
||||||
+/*
|
+/*
|
||||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||||
+ *
|
+ *
|
||||||
@ -143,7 +143,9 @@
|
|||||||
+#include <net/sock.h>
|
+#include <net/sock.h>
|
||||||
+#include <net/pkt_sched.h>
|
+#include <net/pkt_sched.h>
|
||||||
+#include <linux/jhash.h>
|
+#include <linux/jhash.h>
|
||||||
|
+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
|
||||||
+#include <net/netfilter/nf_conntrack.h>
|
+#include <net/netfilter/nf_conntrack.h>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Stochastic Fairness Queuing algorithm.
|
+/* Stochastic Fairness Queuing algorithm.
|
||||||
+ For more comments look at sch_sfq.c.
|
+ For more comments look at sch_sfq.c.
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/sched/sch_esfq.c
|
+++ b/net/sched/sch_esfq.c
|
||||||
@@ -0,0 +1,700 @@
|
@@ -0,0 +1,702 @@
|
||||||
+/*
|
+/*
|
||||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||||
+ *
|
+ *
|
||||||
@ -144,7 +144,9 @@
|
|||||||
+#include <net/sock.h>
|
+#include <net/sock.h>
|
||||||
+#include <net/pkt_sched.h>
|
+#include <net/pkt_sched.h>
|
||||||
+#include <linux/jhash.h>
|
+#include <linux/jhash.h>
|
||||||
|
+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
|
||||||
+#include <net/netfilter/nf_conntrack.h>
|
+#include <net/netfilter/nf_conntrack.h>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Stochastic Fairness Queuing algorithm.
|
+/* Stochastic Fairness Queuing algorithm.
|
||||||
+ For more comments look at sch_sfq.c.
|
+ For more comments look at sch_sfq.c.
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/sched/sch_esfq.c
|
+++ b/net/sched/sch_esfq.c
|
||||||
@@ -0,0 +1,700 @@
|
@@ -0,0 +1,702 @@
|
||||||
+/*
|
+/*
|
||||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||||
+ *
|
+ *
|
||||||
@ -144,7 +144,9 @@
|
|||||||
+#include <net/sock.h>
|
+#include <net/sock.h>
|
||||||
+#include <net/pkt_sched.h>
|
+#include <net/pkt_sched.h>
|
||||||
+#include <linux/jhash.h>
|
+#include <linux/jhash.h>
|
||||||
|
+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
|
||||||
+#include <net/netfilter/nf_conntrack.h>
|
+#include <net/netfilter/nf_conntrack.h>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Stochastic Fairness Queuing algorithm.
|
+/* Stochastic Fairness Queuing algorithm.
|
||||||
+ For more comments look at sch_sfq.c.
|
+ For more comments look at sch_sfq.c.
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/sched/sch_esfq.c
|
+++ b/net/sched/sch_esfq.c
|
||||||
@@ -0,0 +1,700 @@
|
@@ -0,0 +1,702 @@
|
||||||
+/*
|
+/*
|
||||||
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
|
||||||
+ *
|
+ *
|
||||||
@ -144,7 +144,9 @@
|
|||||||
+#include <net/sock.h>
|
+#include <net/sock.h>
|
||||||
+#include <net/pkt_sched.h>
|
+#include <net/pkt_sched.h>
|
||||||
+#include <linux/jhash.h>
|
+#include <linux/jhash.h>
|
||||||
|
+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
|
||||||
+#include <net/netfilter/nf_conntrack.h>
|
+#include <net/netfilter/nf_conntrack.h>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Stochastic Fairness Queuing algorithm.
|
+/* Stochastic Fairness Queuing algorithm.
|
||||||
+ For more comments look at sch_sfq.c.
|
+ For more comments look at sch_sfq.c.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user