diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-22 20:25:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-22 20:25:45 +0200 |
| commit | 572152adfba711f770fc7ec5d140070a91d8e045 (patch) | |
| tree | f674c351988d101c686503b9c4af56a2b28fd167 /include | |
| parent | ipv4: Avoid crashing in ip_error (diff) | |
| parent | Revert "netfilter: bridge: query conntrack about skb dnat" (diff) | |
| download | linux-572152adfba711f770fc7ec5d140070a91d8e045.tar.xz linux-572152adfba711f770fc7ec5d140070a91d8e045.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contain Netfilter fixes for your net tree, they are:
1) Fix a race in nfnetlink_log and nfnetlink_queue that can lead to a crash.
This problem is due to wrong order in the per-net registration and netlink
socket events. Patch from Francesco Ruggeri.
2) Make sure that counters that userspace pass us are higher than 0 in all the
x_tables frontends. Discovered via Trinity, patch from Dave Jones.
3) Revert a patch for br_netfilter to rely on the conntrack status bits. This
breaks stateless IPv6 NAT transformations. Patch from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 66e374d62f64..f15154a879c7 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -176,6 +176,7 @@ struct nf_bridge_info { struct net_device *physindev; struct net_device *physoutdev; char neigh_header[8]; + __be32 ipv4_daddr; }; #endif |