Hi Linus, Dave, On Wed, 05 Oct 2016 01:44:37 -0400 (EDT) David Miller <davem@xxxxxxxxxxxxx> wrote: > I have been carrying the following merge fix patch (for the merge of the net-next tree with Linus' tree) for a while now which seems to have got missed: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Tue, 13 Sep 2016 10:08:58 +1000 Subject: [PATCH] netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment" Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- include/net/netfilter/nf_tables_ipv4.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h index 968f00b82fb5..25e33aee91e7 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; -- 2.8.1 -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
