diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-16 15:27:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-16 15:27:16 -0700 |
| commit | 38a4dfcf807ede483fa798d37dcd8473b327de09 (patch) | |
| tree | 2cda71874a76e1c381511105b4ec204c47581112 /include/net/netns | |
| parent | c3caf1192f904de2f1381211f564537235d50de3 (diff) | |
| parent | ce355e209feb030945dae4c358c02f29a84f3f8b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/nf_tables fixes
The following patchset contains nf_tables fixes, they are:
1) Fix wrong transaction handling when the table flags are not
modified.
2) Fix missing rcu read_lock section in the netlink dump path, which
is not protected by the nfnl_lock.
3) Set NLM_F_DUMP_INTR in the netlink dump path to indicate
interferences with updates.
4) Fix 64 bits chain counters when they are retrieved from a 32 bits
arch, from Eric Dumazet.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/nftables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/nftables.h b/include/net/netns/nftables.h index 26a394cb91a..eee608b12cc 100644 --- a/include/net/netns/nftables.h +++ b/include/net/netns/nftables.h @@ -13,8 +13,8 @@ struct netns_nftables { struct nft_af_info *inet; struct nft_af_info *arp; struct nft_af_info *bridge; + unsigned int base_seq; u8 gencursor; - u8 genctr; }; #endif |