diff options
| author | David S. Miller <[email protected]> | 2018-12-12 21:36:12 -0800 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-12-12 21:36:12 -0800 |
| commit | 18330c58e309d88261cf981c04c91f9130402594 (patch) | |
| tree | 05759229e54bc4242c67688cedc1a6d70301ff92 /tools/perf/scripts/python/netdev-times.py | |
| parent | 9463b9a4e0e480a70d366c0cbbfd0c814fd35d90 (diff) | |
| parent | d4e7df16567b80836a78d31b42f1a9355a636d67 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix warnings suspicious rcu usage when handling base chain
statistics, from Taehee Yoo.
2) Refetch pointer to tcp header from nf_ct_sack_adjust() since
skb_make_writable() may reallocate data area, reported by Google
folks patch from Florian.
3) Incorrect netlink nest end after previous cancellation from error
path in ipset, from Pan Bian.
4) Use dst_hold_safe() from nf_xfrm_me_harder(), from Florian.
5) Use rb_link_node_rcu() for rcu-protected rbtree node in
nf_conncount, from Taehee Yoo.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions