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>
This commit is contained in:
Stephen Rothwell 2016-09-13 10:08:58 +10:00 committed by David S. Miller
parent 5bfb88a163
commit a44c984f1e

View File

@ -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;