X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3fd35e7800ae1f2dd3fa42ade850c948e4b18ea..19b6acd0905aef3f8718e694c0264ef5ddcf6403:/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch

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 f72c0e370..f3636e652 100644
--- 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
-@@ -0,0 +1,700 @@
+@@ -0,0 +1,702 @@
 +/*
 + * 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>
++#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.
@@ -268,7 +270,7 @@
 +		break;
 +	}
 +	default:
-+		info.dst   = (u32)(unsigned long)skb->dst;
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
 +		info.src   = (u32)(unsigned long)skb->sk;
 +		info.proto = skb->protocol;
 +	}