mirror of https://github.com/hak5/openwrt-owl.git
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: 18900owl
parent
917f4cf2a5
commit
3969ccfde4
|
@ -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…
Reference in New Issue