[PATCH 2/3] esp: remove redundant define esph

[Steffen Klassert]

From: Haishuang Yan <yanhaishu...@cmss.chinamobile.com>

The pointer 'esph' is defined but is never used hence it is redundant
and canbe removed.

Signed-off-by: Haishuang Yan <yanhaishu...@cmss.chinamobile.com>
Signed-off-by: Steffen Klassert <steffen.klass...@secunet.com>
---
 net/ipv4/esp4.c | 7 +++----
 net/ipv6/esp6.c | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 97689012b357..211caaf27f6e 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -683,12 +683,11 @@ static void esp_input_done_esn(struct 
crypto_async_request *base, int err)
  */
 static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 {
-       struct ip_esp_hdr *esph;
        struct crypto_aead *aead = x->data;
        struct aead_request *req;
        struct sk_buff *trailer;
        int ivlen = crypto_aead_ivsize(aead);
-       int elen = skb->len - sizeof(*esph) - ivlen;
+       int elen = skb->len - sizeof(struct ip_esp_hdr) - ivlen;
        int nfrags;
        int assoclen;
        int seqhilen;
@@ -698,13 +697,13 @@ static int esp_input(struct xfrm_state *x, struct sk_buff 
*skb)
        struct scatterlist *sg;
        int err = -EINVAL;
 
-       if (!pskb_may_pull(skb, sizeof(*esph) + ivlen))
+       if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))
                goto out;
 
        if (elen <= 0)
                goto out;
 
-       assoclen = sizeof(*esph);
+       assoclen = sizeof(struct ip_esp_hdr);
        seqhilen = 0;
 
        if (x->props.flags & XFRM_STATE_ESN) {
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 88a7579c23bd..63b2b66f9dfa 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -601,12 +601,11 @@ static void esp_input_done_esn(struct 
crypto_async_request *base, int err)
 
 static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
 {
-       struct ip_esp_hdr *esph;
        struct crypto_aead *aead = x->data;
        struct aead_request *req;
        struct sk_buff *trailer;
        int ivlen = crypto_aead_ivsize(aead);
-       int elen = skb->len - sizeof(*esph) - ivlen;
+       int elen = skb->len - sizeof(struct ip_esp_hdr) - ivlen;
        int nfrags;
        int assoclen;
        int seqhilen;
@@ -616,7 +615,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff 
*skb)
        u8 *iv;
        struct scatterlist *sg;
 
-       if (!pskb_may_pull(skb, sizeof(*esph) + ivlen)) {
+       if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {
                ret = -EINVAL;
                goto out;
        }
@@ -626,7 +625,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff 
*skb)
                goto out;
        }
 
-       assoclen = sizeof(*esph);
+       assoclen = sizeof(struct ip_esp_hdr);
        seqhilen = 0;
 
        if (x->props.flags & XFRM_STATE_ESN) {
-- 
2.17.1