[ifxmips] update Makefile

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 200-sched_esfq.patch

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 ac39a8c..3f66e2c 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
@@ -1,7 +1,5 @@
-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
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
 @@ -162,8 +162,37 @@ struct tc_sfq_xstats
   *
   *    The only reason for this is efficiency, it is possible
@@ -40,10 +38,8 @@ 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
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
 @@ -139,6 +139,37 @@ config NET_SCH_SFQ
          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
@@ -82,10 +78,8 @@ 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
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
 @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED)   += sch_gred.o
  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
@@ -94,11 +88,9 @@ 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
-@@ -0,0 +1,702 @@
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,704 @@
 +/*
 + * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.
 + *
@@ -151,7 +143,9 @@ Index: linux-2.6.25.4/net/sched/sch_esfq.c
 +#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.