xfrm: free not used XFRM_ESP_NO_TRAILER flag

[linux-2.6-microblaze.git] / net / ipv4 / esp4.c

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index d747166..b21238d 100644 (file)
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -705,7 +705,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
 static inline int esp_remove_trailer(struct sk_buff *skb)
 {
        struct xfrm_state *x = xfrm_input_state(skb);
-       struct xfrm_offload *xo = xfrm_offload(skb);
        struct crypto_aead *aead = x->data;
        int alen, hlen, elen;
        int padlen, trimlen;
@@ -717,11 +716,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb)
        hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);
        elen = skb->len - hlen;
 
-       if (xo && (xo->flags & XFRM_ESP_NO_TRAILER)) {
-               ret = xo->proto;
-               goto out;
-       }
-
        if (skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2))
                BUG();