From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 00:08:58 +0000 (+1000)
Subject: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
X-Git-Tag: v4.9-rc1~113^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a44c984f1ef16229cdfd92326ad10118b1940ff9;p=platform%2Fkernel%2Flinux-amlogic.git

netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
index 968f00b..25e33ae 100644
--- a/include/net/netfilter/nf_tables_ipv4.h
+++ b/include/net/netfilter/nf_tables_ipv4.h
@@ -33,7 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
 	if (!iph)
 		return -1;
 
-	iph = ip_hdr(skb);
 	if (iph->ihl < 5 || iph->version != 4)
 		return -1;