aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-01-11 19:26:11 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-01-11 19:26:11 +0000
commit2f9958d22c7b8c8429f9b9dd8de33d478ec43e5e (patch)
treeba3d8fe40c357bfa12cb8ef17d2f27bc8996ac8e /target
parentff2afa0c9c69cc4c39c2e40dfb0e4ff2336dde6e (diff)
downloadupstream-2f9958d22c7b8c8429f9b9dd8de33d478ec43e5e.tar.gz
upstream-2f9958d22c7b8c8429f9b9dd8de33d478ec43e5e.tar.bz2
upstream-2f9958d22c7b8c8429f9b9dd8de33d478ec43e5e.zip
Fix esfq compilation (#3005)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10174 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch
index b68fafef7b..ac5eeee81f 100644
--- a/target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch
@@ -239,7 +239,7 @@ diff -Naur linux-2.6.21.5.orig/net/sched/sch_esfq.c linux-2.6.21.5/net/sched/sch
+ switch (skb->protocol) {
+ case __constant_htons(ETH_P_IP):
+ {
-+ struct iphdr *iph = skb->nh.iph;
++ struct iphdr *iph = ip_hdr(skb);
+ info.dst = iph->daddr;
+ info.src = iph->saddr;
+ if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
@@ -255,7 +255,7 @@ diff -Naur linux-2.6.21.5.orig/net/sched/sch_esfq.c linux-2.6.21.5/net/sched/sch
+ }
+ case __constant_htons(ETH_P_IPV6):
+ {
-+ struct ipv6hdr *iph = skb->nh.ipv6h;
++ struct ipv6hdr *iph = ipv6_hdr(skb);
+ /* Hash ipv6 addresses into a u32. This isn't ideal,
+ * but the code is simple. */
+ info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);