---

yaml --- r: 265522 b: refs/heads/master c: ec5efe7 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · 689a0b1 · 689a0b1
1 parent 8b922eb
commit 689a0b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -2608,6 +2608,8 @@ void __skb_get_rxhash(struct sk_buff *skb)
 			}
 		}
 		break;
+	case IPPROTO_IPIP:
+		goto again;
 	default:
 		break;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2608,6 +2608,8 @@ void __skb_get_rxhash(struct sk_buff *skb) @@
     			}
     		}
     		break;
+    	case IPPROTO_IPIP:
+    		goto again;
     	default:
     		break;
     	}
@@ Expand Down @@