Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf05ece authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC] esp: Kill unnecessary block and indentation 



We used to keep sg on the stack which is why the extra block was useful.
We've long since stopped doing that so let's kill the block and save
some indentation.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de5f503c

net/ipv4/esp4.c

+43 −44
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc 
	int elen = skb->len - sizeof(struct ip_esp_hdr) - esp->conf.ivlen - alen;

	int nfrags;

	int encap_len = 0;

	u8 nexthdr[2];

	struct scatterlist *sg;

	u8 workbuf[60];

	int padlen;



	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr)))

		goto out;
@@ -185,11 +189,7 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc 
	if (esp->conf.ivlen)

		crypto_cipher_set_iv(esp->conf.tfm, esph->enc_data, crypto_tfm_alg_ivsize(esp->conf.tfm));



        {

		u8 nexthdr[2];

		struct scatterlist *sg = &esp->sgbuf[0];

		u8 workbuf[60];

		int padlen;

	sg = &esp->sgbuf[0];



	if (unlikely(nfrags > ESP_NUM_FAST_SG)) {

		sg = kmalloc(sizeof(struct scatterlist)*nfrags, GFP_ATOMIC);
@@ -238,7 +238,6 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc 
	skb->nh.raw += encap_len + sizeof(struct ip_esp_hdr) + esp->conf.ivlen;

	memcpy(skb->nh.raw, workbuf, iph->ihl*4);

	skb->nh.iph->tot_len = htons(skb->len);

	}



	return 0;