summaryrefslogtreecommitdiffstats
path: root/net/ieee802154/trace.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-08-15 14:01:14 -0700
committerDavid S. Miller <davem@davemloft.net>2019-08-15 14:01:14 -0700
commit12ed60151345f92d788ee2693824c1831c6c6cb2 (patch)
treefb01108c39b553fe723398aecf3db8f21ff4ac9a /net/ieee802154/trace.c
parent32d3182cd2cd29b2e7e04df7b0db350fbe11289f (diff)
parentdfe42be15fde16232340b8b2a57c359f51cc10d9 (diff)
downloadlinux-12ed60151345f92d788ee2693824c1831c6c6cb2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net This patchset contains Netfilter fixes for net: 1) Extend selftest to cover flowtable with ipsec, from Florian Westphal. 2) Fix interaction of ipsec with flowtable, also from Florian. 3) User-after-free with bound set to rule that fails to load. 4) Adjust state and timeout for flows that expire. 5) Timeout update race with flows in teardown state. 6) Ensure conntrack id hash calculation use invariants as input, from Dirk Morris. 7) Do not push flows into flowtable for TCP fin/rst packets. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154/trace.c')
0 files changed, 0 insertions, 0 deletions