diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:13:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:13:35 +0300 |
| commit | d230ec72c4efed7d0f414a80a756c54d4c422a6e (patch) | |
| tree | d437aaad8dfb78dc6926a704b96f09fed6a874e8 /include | |
| parent | f84d9fa86820b3074a8c143444a6932c0c0fd019 (diff) | |
| parent | af70c1f92d3567035d2f73f39079459d58c706dc (diff) | |
| download | linux-d230ec72c4efed7d0f414a80a756c54d4c422a6e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixups from David Miller:
"Here are the build and merge fixups for the networking stuff"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
phy: micrel.c: Enable ksz9031 energy-detect power-down mode
netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
netfilter: nft_limit: fix divided by zero panic
netfilter: fix namespace handling in nf_log_proc_dostring
netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division
netfilter: accommodate different kconfig in nf_set_hooks_head
netfilter: Fix potential null pointer dereference
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_tables_ipv4.h | 1 |
1 files changed, 0 insertions, 1 deletions
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; |