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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Stephen Rothwell and committed by

David S. Miller 9 years ago a44c984f 5bfb88a1

-1

1 changed file

expand all

include

net

netfilter

nf_tables_ipv4.h

-1

include/net/netfilter/nf_tables_ipv4.h

··· 33 33 if (!iph) 34 34 return -1; 35 35 36 - iph = ip_hdr(skb); 37 36 if (iph->ihl < 5 || iph->version != 4) 38 37 return -1; 39 38