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.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 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
-@@ -0,0 +1,702 @@
+@@ -0,0 +1,704 @@
 +/*
 + * 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>
++#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.