KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix esfq compilation (#3005)

Browse source 
SVN-Revision: 10174
This commit is contained in:
Florian Fainelli 2008-01-11 19:26:11 +00:00
parent e22d12ddfc
commit 4e9cc1b056
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/generic-2.6/patches-2.6.23/200-sched_esfq.patch
View file

@ -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) { + switch (skb->protocol) {
+ case __constant_htons(ETH_P_IP): + case __constant_htons(ETH_P_IP):
+ { + {
+ struct iphdr *iph = skb->nh.iph; + struct iphdr *iph = ip_hdr(skb);
+ info.dst = iph->daddr; + info.dst = iph->daddr;
+ info.src = iph->saddr; + info.src = iph->saddr;
+ if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) && + 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): + 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, + /* Hash ipv6 addresses into a u32. This isn't ideal,
+ * but the code is simple. */ + * but the code is simple. */
+ info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation); + info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);