diff mbox series

esp4: remove redundant initialization of pointer esph

Message ID 20180130145348.32202-1-colin.king@canonical.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show
Series esp4: remove redundant initialization of pointer esph | expand

Commit Message

Colin Ian King Jan. 30, 2018, 2:53 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Pointer esph is being assigned a value that is never read, esph is
re-assigned and only read inside an if statement, hence the
initialization is redundant and can be removed.

Cleans up clang warning:
net/ipv4/esp4.c:657:21: warning: Value stored to 'esph' during
its initialization is never read

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 net/ipv4/esp4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steffen Klassert Feb. 2, 2018, 7:37 a.m. UTC | #1 
On Tue, Jan 30, 2018 at 02:53:48PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Pointer esph is being assigned a value that is never read, esph is
> re-assigned and only read inside an if statement, hence the
> initialization is redundant and can be removed.
> 
> Cleans up clang warning:
> net/ipv4/esp4.c:657:21: warning: Value stored to 'esph' during
> its initialization is never read
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

I've queued this for ipsec-next, will be applied
after the merge window.
Steffen Klassert Feb. 14, 2018, 11:48 a.m. UTC | #2 
On Fri, Feb 02, 2018 at 08:37:50AM +0100, Steffen Klassert wrote:
> On Tue, Jan 30, 2018 at 02:53:48PM +0000, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > Pointer esph is being assigned a value that is never read, esph is
> > re-assigned and only read inside an if statement, hence the
> > initialization is redundant and can be removed.
> > 
> > Cleans up clang warning:
> > net/ipv4/esp4.c:657:21: warning: Value stored to 'esph' during
> > its initialization is never read
> > 
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> 
> I've queued this for ipsec-next, will be applied
> after the merge window.

Now applied to ipsec-next, thanks!
diff mbox series

Patch

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 296d0b956bfe..97689012b357 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -654,7 +654,7 @@  static void esp_input_restore_header(struct sk_buff *skb)
 static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)
 {
 	struct xfrm_state *x = xfrm_input_state(skb);
-	struct ip_esp_hdr *esph = (struct ip_esp_hdr *)skb->data;
+	struct ip_esp_hdr *esph;
 
 	/* For ESN we move the header forward by 4 bytes to
 	 * accomodate the high bits.  We will move it back after