OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5bfb88a
)
netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Tue, 13 Sep 2016 00:08:58 +0000
(10:08 +1000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 6 Oct 2016 00:25:48 +0000
(20:25 -0400)
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>
include/net/netfilter/nf_tables_ipv4.h
patch
|
blob
|
history
diff --git
a/include/net/netfilter/nf_tables_ipv4.h
b/include/net/netfilter/nf_tables_ipv4.h
index
968f00b
..
25e33ae
100644
(file)
--- 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;