* [PATCH] ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref()
@ 2021-07-16 20:28 minyard
2021-07-22 9:42 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: minyard @ 2021-07-16 20:28 UTC (permalink / raw)
To: netdev; +Cc: Corey Minyard, Steffen Klassert, Herbert Xu, David S. Miller
From: Corey Minyard <cminyard@mvista.com>
It's assigned twice, but only used to calculate the size of the
structure it points to. Just remove it and take a sizeof the
actual structure.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
---
net/ipv4/esp4.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index a09e36c4a413..851f542928a3 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -97,7 +97,6 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead,
static void esp_ssg_unref(struct xfrm_state *x, void *tmp)
{
- struct esp_output_extra *extra = esp_tmp_extra(tmp);
struct crypto_aead *aead = x->data;
int extralen = 0;
u8 *iv;
@@ -105,9 +104,8 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)
struct scatterlist *sg;
if (x->props.flags & XFRM_STATE_ESN)
- extralen += sizeof(*extra);
+ extralen += sizeof(struct esp_output_extra);
- extra = esp_tmp_extra(tmp);
iv = esp_tmp_iv(aead, tmp, extralen);
req = esp_tmp_req(aead, iv);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref()
2021-07-16 20:28 [PATCH] ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref() minyard
@ 2021-07-22 9:42 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2021-07-22 9:42 UTC (permalink / raw)
To: minyard; +Cc: netdev, Corey Minyard, Herbert Xu, David S. Miller
On Fri, Jul 16, 2021 at 03:28:46PM -0500, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
>
> It's assigned twice, but only used to calculate the size of the
> structure it points to. Just remove it and take a sizeof the
> actual structure.
>
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> Cc: Steffen Klassert <steffen.klassert@secunet.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: netdev@vger.kernel.org
Applied to ipsec-next, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-22 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16 20:28 [PATCH] ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref() minyard
2021-07-22 9:42 ` Steffen Klassert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.