diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
commit | 0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (patch) | |
tree | 5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch | |
parent | 2004a63a81f73ab8d3b926815a11119b5b81c071 (diff) | |
download | upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.gz upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.bz2 upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.zip |
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch | 28 |
1 files changed, 10 insertions, 18 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 ac39a8c72f..1dfd95e82b 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 @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/include/linux/pkt_sched.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/pkt_sched.h -+++ linux-2.6.25.4/include/linux/pkt_sched.h -@@ -162,8 +162,37 @@ struct tc_sfq_xstats +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h +@@ -162,8 +162,37 @@ * * The only reason for this is efficiency, it is possible * to change these parameters in compile time. @@ -40,11 +38,9 @@ Index: linux-2.6.25.4/include/linux/pkt_sched.h /* RED section */ enum -Index: linux-2.6.25.4/net/sched/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/net/sched/Kconfig -+++ linux-2.6.25.4/net/sched/Kconfig -@@ -139,6 +139,37 @@ config NET_SCH_SFQ +--- a/net/sched/Kconfig ++++ b/net/sched/Kconfig +@@ -139,6 +139,37 @@ To compile this code as a module, choose M here: the module will be called sch_sfq. @@ -82,11 +78,9 @@ Index: linux-2.6.25.4/net/sched/Kconfig config NET_SCH_TEQL tristate "True Link Equalizer (TEQL)" ---help--- -Index: linux-2.6.25.4/net/sched/Makefile -=================================================================== ---- linux-2.6.25.4.orig/net/sched/Makefile -+++ linux-2.6.25.4/net/sched/Makefile -@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o +--- a/net/sched/Makefile ++++ b/net/sched/Makefile +@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o @@ -94,10 +88,8 @@ Index: linux-2.6.25.4/net/sched/Makefile obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o -Index: linux-2.6.25.4/net/sched/sch_esfq.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/sched/sch_esfq.c ++++ b/net/sched/sch_esfq.c @@ -0,0 +1,702 @@ +/* + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. |