Skip to contentSkip to conversation

net: rps: fix the wrong network header pointer

PATCH Applied Changli Gao 2 participants 2 messages Aug 21, 2010 – Aug 22, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Changli Gao

author
#0 lore raw

PATCH 1/1 net: rps: fix the wrong network header pointer

__skb_get_rxhash() was broken after the commit:

commit bfb564e7391340638afe4ad67744a8f3858e7566
Author: Krishna Kumar <[email protected]>
Date: Wed Aug 4 06:15:52 2010 +0000

core: Factor out flow calculation from get_rps_cpu

Signed-off-by Changli Gao <[email protected]>
---
 net/core/dev.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/dev.c +2 -2
index da584f5..4d74d26 100644
@@ -2283,7 +2283,7 @@ __u32 __skb_get_rxhash(struct sk_buff *skb)
 		if (!pskb_may_pull(skb, sizeof(*ip) + nhoff))
 			goto done;
 
-		ip = (struct iphdr *) skb->data + nhoff;
+		ip = (struct iphdr *) (skb->data + nhoff);
 		if (ip->frag_off & htons(IP_MF | IP_OFFSET))
 			ip_proto = 0;
 		else

@@ -2296,7 +2296,7 @@ __u32 __skb_get_rxhash(struct sk_buff *skb)
 		if (!pskb_may_pull(skb, sizeof(*ip6) + nhoff))
 			goto done;
 
-		ip6 = (struct ipv6hdr *) skb->data + nhoff;
+		ip6 = (struct ipv6hdr *) (skb->data + nhoff);
 		ip_proto = ip6->nexthdr;
 		addr1 = (__force u32) ip6->saddr.s6_addr32[3];
 		addr2 = (__force u32) ip6->daddr.s6_addr32[3];
maintainer Applied
#1 lore raw

From: Changli Gao <[email protected]>
Date: Sun, 22 Aug 2010 00:13:28 +0800

Quoted 9 lines

__skb_get_rxhash() was broken after the commit:

commit bfb564e7391340638afe4ad67744a8f3858e7566
Author: Krishna Kumar <[email protected]>
Date: Wed Aug 4 06:15:52 2010 +0000

core: Factor out flow calculation from get_rps_cpu

Signed-off-by Changli Gao <[email protected]>

Applied, thanks.