From 3a61209c0b8d8656e0de869f09745d5bf54e6340 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Sat, 21 Aug 2010 06:13:28 +0000
Subject: [PATCH] --- yaml --- r: 213895 b: refs/heads/master c:
 1003489e06c04d807c783a8958f2ccc9aed7a244 h: refs/heads/master i:   213893:
 65b2a02a9b576d824f47de43024659623baab6a3   213891:
 e376a22069ac2f90a800505e8acc8d187c40f974   213887:
 24e2dda4bfe43b95137ddfa0cb2a496dc6b27308 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 33d368296f59..68cf49005e26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb4d40654505e47aa9d2035bb97f631fa61d14b4
+refs/heads/master: 1003489e06c04d807c783a8958f2ccc9aed7a244
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index da584f5ab3d2..4d74d26b8e1a 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/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];