---

yaml --- r: 122463 b: refs/heads/master c: e061b16 h: refs/heads/master i: 122461: d3ddd4d 122459: 871714d 122455: 5845f95 122447: 6d5475b 122431: 71329ab v: v3
git-mirror · Dec 4, 2008 · 49600d7 · 49600d7
1 parent 06ee994
commit 49600d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9b766ca7c4654d41f4f21357031c1c1e7de29e
+refs/heads/master: e061b165c7f4ec5e2e160d990b49011b5b6e5c6a
diff --git a/trunk/net/xfrm/xfrm_input.c b/trunk/net/xfrm/xfrm_input.c
@@ -167,11 +167,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 			goto drop_unlock;
 		}
 
-		if ((x->encap ? x->encap->encap_type : 0) != encap_type) {
-			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMISMATCH);
-			goto drop_unlock;
-		}
-
 		if (x->props.replay_window && xfrm_replay_check(x, skb, seq)) {
 			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR);
 			goto drop_unlock;