From 689a0b1ac8a80dda332a8151438127e922363fa1 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 24 Aug 2011 10:41:19 +0000
Subject: [PATCH] --- yaml --- r: 265522 b: refs/heads/master c:
 ec5efe7946280d1e84603389a1030ccec0a767ae h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0e70f20083ef..6695ed1650b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e43182c0c9482a26a4108da9254f3e2869a8e18
+refs/heads/master: ec5efe7946280d1e84603389a1030ccec0a767ae
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index a4306f7e4d09..b668a3d9a189 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2608,6 +2608,8 @@ void __skb_get_rxhash(struct sk_buff *skb)
 			}
 		}
 		break;
+	case IPPROTO_IPIP:
+		goto again;
 	default:
 		break;
 	}