diff options
Diffstat (limited to 'net/ipv4/esp4.c')
-rw-r--r-- | net/ipv4/esp4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index bf88c620a954..9d1881c07a32 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -133,7 +133,7 @@ error: | |||
133 | * expensive, so we only support truncated data, which is the recommended | 133 | * expensive, so we only support truncated data, which is the recommended |
134 | * and common case. | 134 | * and common case. |
135 | */ | 135 | */ |
136 | static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 136 | static int esp_input(struct xfrm_state *x, struct sk_buff *skb) |
137 | { | 137 | { |
138 | struct iphdr *iph; | 138 | struct iphdr *iph; |
139 | struct ip_esp_hdr *esph; | 139 | struct ip_esp_hdr *esph; |
@@ -208,9 +208,6 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc | |||
208 | struct xfrm_encap_tmpl *encap = x->encap; | 208 | struct xfrm_encap_tmpl *encap = x->encap; |
209 | struct udphdr *uh; | 209 | struct udphdr *uh; |
210 | 210 | ||
211 | if (encap->encap_type != decap->decap_type) | ||
212 | goto out; | ||
213 | |||
214 | uh = (struct udphdr *)(iph + 1); | 211 | uh = (struct udphdr *)(iph + 1); |
215 | encap_len = (void*)esph - (void*)uh; | 212 | encap_len = (void*)esph - (void*)uh; |
216 | 213 | ||