From 49600d7c854439377d0ea98be52bcb013613810b Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Thu, 4 Dec 2008 15:40:17 -0800
Subject: [PATCH] --- yaml --- r: 122463 b: refs/heads/master c:
 e061b165c7f4ec5e2e160d990b49011b5b6e5c6a h: refs/heads/master i:   122461:
 d3ddd4db67188cfe1bca94174193cd1b98998f98   122459:
 871714d21a39a4579e8e13791a7eab7a7df0a155   122455:
 5845f958beddfa39d7e406f9150bbde776b1ebfd   122447:
 6d5475b475e2dee55ced9c5770328c150e0d306a   122431:
 71329ab85d6c6e2a963422ecf877df3ad6c342a9 v: v3

---
 [refs]                      | 2 +-
 trunk/net/xfrm/xfrm_input.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9526d81f14e3..fa16e26ecec1 100644
--- 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
index b4a13178fb40..65bcf09251ef 100644
--- 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;