2017-08-23 11:59:57

by Colin King

Subject: [PATCH][V2][netdev-next] gre: remove duplicated assignment of iph

From: Colin Ian King <[email protected]>

iph is being assigned the same value twice; remove the redundant
first assignment. (Thanks to Nikolay Aleksandrov for pointing out
that the first asssignment should be removed and not the second)

Fixes warning:
net/ipv4/ip_gre.c:265:2: warning: Value stored to 'iph' is never read

Signed-off-by: Colin Ian King <[email protected]>
---
net/ipv4/ip_gre.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6e8a62289e03..161326f7f10b 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -262,7 +262,6 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
int len;

itn = net_generic(net, erspan_net_id);
- iph = ip_hdr(skb);
len = gre_hdr_len + sizeof(*ershdr);

if (unlikely(!pskb_may_pull(skb, len)))
--
2.14.1

2017-08-23 12:26:26

by Nikolay Aleksandrov

Subject: Re: [PATCH][V2][netdev-next] gre: remove duplicated assignment of iph

On 23/08/17 14:59, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> iph is being assigned the same value twice; remove the redundant
> first assignment. (Thanks to Nikolay Aleksandrov for pointing out
> that the first asssignment should be removed and not the second)
>
> Fixes warning:
> net/ipv4/ip_gre.c:265:2: warning: Value stored to 'iph' is never read
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> net/ipv4/ip_gre.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index 6e8a62289e03..161326f7f10b 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -262,7 +262,6 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
> int len;
>
> itn = net_generic(net, erspan_net_id);
> - iph = ip_hdr(skb);
> len = gre_hdr_len + sizeof(*ershdr);
>
> if (unlikely(!pskb_may_pull(skb, len)))
>

LGTM,

Reviewed-by: Nikolay Aleksandrov <[email protected]>

2017-08-24 05:36:19

by David Miller

Subject: Re: [PATCH][V2][netdev-next] gre: remove duplicated assignment of iph

From: Colin King <[email protected]>
Date: Wed, 23 Aug 2017 12:59:48 +0100

> From: Colin Ian King <[email protected]>
>
> iph is being assigned the same value twice; remove the redundant
> first assignment. (Thanks to Nikolay Aleksandrov for pointing out
> that the first asssignment should be removed and not the second)
>
> Fixes warning:
> net/ipv4/ip_gre.c:265:2: warning: Value stored to 'iph' is never read
>
> Signed-off-by: Colin Ian King <[email protected]>

Much better, applied, thanks.