diff options
| author |   Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2018-08-17 15:51:00 +0800 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2018-08-29 08:02:43 +0200 |
| commit | 0c05f98376678098e9a4a8bc06839797ea3ee942 (patch) | |
| tree | 461a1ffc3b4b41e677775df6176ca63ddffc553e /net/ipv4/esp4.c | |
| parent | xfrm: Make function xfrmi_get_link_net() static (diff) | |
| download | linux-dev-0c05f98376678098e9a4a8bc06839797ea3ee942.tar.xz linux-dev-0c05f98376678098e9a4a8bc06839797ea3ee942.zip | |
esp: remove redundant define esph
The pointer 'esph' is defined but is never used hence it is redundant
and canbe removed.
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/esp4.c | 7 |
1 files changed, 3 insertions, 4 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) { |