diff mbox series

esp6: remove redundant initialization of esph

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

Commit Message

Colin Ian King Oct. 19, 2017, 1:09 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

The pointer esph is being initialized with a value that is never
read and then being updated.  Remove the redundant initialization
and move the declaration and initializtion of esph to the local
code block.

Cleans up clang warning:
net/ipv6/esp6.c:562:21: warning: Value stored to 'esph' during its
initialization is never read

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 net/ipv6/esp6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Steffen Klassert Oct. 23, 2017, 11:21 a.m. UTC | #1 
On Thu, Oct 19, 2017 at 03:09:47PM +0200, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The pointer esph is being initialized with a value that is never
> read and then being updated.  Remove the redundant initialization
> and move the declaration and initializtion of esph to the local
> code block.
> 
> Cleans up clang warning:
> net/ipv6/esp6.c:562:21: warning: Value stored to 'esph' during its
> initialization is never read
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to ipsec-next, thanks!
diff mbox series

Patch

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 89910e2c10f4..1696401fed6c 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -559,14 +559,14 @@  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;
 
 	/* For ESN we move the header forward by 4 bytes to
 	 * accomodate the high bits.  We will move it back after
 	 * decryption.
 	 */
 	if ((x->props.flags & XFRM_STATE_ESN)) {
-		esph = skb_push(skb, 4);
+		struct ip_esp_hdr *esph = skb_push(skb, 4);
+
 		*seqhi = esph->spi;
 		esph->spi = esph->seq_no;
 		esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;