From: florian Date: Fri, 11 Jan 2008 19:26:11 +0000 (+0000) Subject: Fix esfq compilation (#3005) X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/e25abeca2dc9deaa4d31a1f9c5b52222eacc5262 Fix esfq compilation (#3005) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10174 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 b68fafef7..ac5eeee81 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);