diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-09-20 22:32:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-20 22:32:20 -0700 |
| commit | ac813744930d2af82d887ce1e51bcdb23a6c6805 (patch) | |
| tree | 954d0156b52878897fbd3ae37ca8b0693916e3f9 /net/ipv4/ip_tunnel_core.c | |
| parent | tipc: reinitialize pointer after skb linearize (diff) | |
| parent | netfilter: nf_log: wait for rcu grace after logger unregistration (diff) | |
| download | linux-dev-ac813744930d2af82d887ce1e51bcdb23a6c6805.tar.xz linux-dev-ac813744930d2af82d887ce1e51bcdb23a6c6805.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patch contains Netfilter fixes for your net tree, they are:
1) nf_log_unregister() should only set to NULL the logger that is being
unregistered, instead of everything else. Patch from Florian Westphal.
2) Fix a crash when accessing physoutdev from PREROUTING in br_netfilter.
This is partially reverting the patch to shrink nf_bridge_info to 32 bytes.
Also from Florian.
3) Use existing match/target extensions in the internal nft_compat extension
lists when the extension is family unspecific (ie. NFPROTO_UNSPEC).
4) Wait for rcu grace period before leaving nf_log_unregister().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
0 files changed, 0 insertions, 0 deletions