* [PATCH] net: rps: fix the wrong network header pointer
@ 2010-08-21 16:13 Changli Gao
2010-08-22 5:55 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Changli Gao @ 2010-08-21 16:13 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Changli Gao
__skb_get_rxhash() was broken after the commit:
commit bfb564e7391340638afe4ad67744a8f3858e7566
Author: Krishna Kumar <krkumar2@in.ibm.com>
Date: Wed Aug 4 06:15:52 2010 +0000
core: Factor out flow calculation from get_rps_cpu
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
net/core/dev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index da584f5..4d74d26 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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];
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: rps: fix the wrong network header pointer
2010-08-21 16:13 [PATCH] net: rps: fix the wrong network header pointer Changli Gao
@ 2010-08-22 5:55 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-08-22 5:55 UTC (permalink / raw)
To: xiaosuo; +Cc: netdev
From: Changli Gao <xiaosuo@gmail.com>
Date: Sun, 22 Aug 2010 00:13:28 +0800
> __skb_get_rxhash() was broken after the commit:
>
> commit bfb564e7391340638afe4ad67744a8f3858e7566
> Author: Krishna Kumar <krkumar2@in.ibm.com>
> Date: Wed Aug 4 06:15:52 2010 +0000
>
> core: Factor out flow calculation from get_rps_cpu
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-22 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-21 16:13 [PATCH] net: rps: fix the wrong network header pointer Changli Gao
2010-08-22 5:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).