generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_NET_SCH_ES...

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

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,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/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.