projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
917f4cf
)
generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_NET_SCH_ES...
author
Nicolas Thill
<nico@openwrt.org>
Wed, 23 Dec 2009 08:12:15 +0000
(08:12 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Wed, 23 Dec 2009 08:12:15 +0000
(08:12 +0000)
SVN-Revision: 18900
target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch
patch
|
blob
|
history
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 a3c02625d9f48e272dc9f87c6111166688985b57..3f66e2c674908be2e3d47fc8c4be6263840071b8 100644
(file)
--- 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
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,70
2
@@
+@@ -0,0 +1,70
4
@@
+/*
+ * 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/pkt_sched.h>
+#include <linux/jhash.h>
+#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>
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.
+
+/* 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 f9ce66efcf1208621df00508af1b9d1fd120f67b..5e2bfba45b95f4c4abadcc3d5b14f958ebd2b26d 100644
(file)
--- 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
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,70
2
@@
+@@ -0,0 +1,70
4
@@
+/*
+ * 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/pkt_sched.h>
+#include <linux/jhash.h>
+#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>
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.
+
+/* 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 f72c0e370538a621928464d6bffbb398ca907954..bf123ce780ce35fa3e3347ce4127c9c9a2339059 100644
(file)
--- 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
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,70
0
@@
+@@ -0,0 +1,70
2
@@
+/*
+ * 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/pkt_sched.h>
+#include <linux/jhash.h>
+#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>
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.
+
+/* 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 fb28e908584091a48c2a2ff798a8ba94c2a8f778..f3636e6521a8b15590af680b1bd4de7919d7e398 100644
(file)
--- 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
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,70
0
@@
+@@ -0,0 +1,70
2
@@
+/*
+ * 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/pkt_sched.h>
+#include <linux/jhash.h>
+#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>
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.
+
+/* 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 fb28e908584091a48c2a2ff798a8ba94c2a8f778..f3636e6521a8b15590af680b1bd4de7919d7e398 100644
(file)
--- 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
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
--- /dev/null
+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,70
0
@@
+@@ -0,0 +1,70
2
@@
+/*
+ * 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/pkt_sched.h>
+#include <linux/jhash.h>
+#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>
+#include <net/netfilter/nf_conntrack.h>
++#endif
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.
+
+/* Stochastic Fairness Queuing algorithm.
+ For more comments look at sch_sfq.c.