Skip to content

Commit 38a4dfc

Browse files
davem330davem330
committed
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>
2 parents c3caf11 + ce355e2 commit 38a4dfc

File tree

4 files changed

+100
-58
lines changed

4 files changed

+100
-58
lines changed

‎include/net/netfilter/nf_tables.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/netfilter/nfnetlink.h>
77
#include <linux/netfilter/x_tables.h>
88
#include <linux/netfilter/nf_tables.h>
9+
#include <linux/u64_stats_sync.h>
910
#include <net/netlink.h>
1011

1112
#define NFT_JUMP_STACK_SIZE 16
@@ -528,8 +529,9 @@ enum nft_chain_type {
528529
};
529530

530531
struct nft_stats {
531-
u64 bytes;
532-
u64 pkts;
532+
u64 bytes;
533+
u64 pkts;
534+
struct u64_stats_sync syncp;
533535
};
534536

535537
#define NFT_HOOK_OPS_MAX 2

‎include/net/netns/nftables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ struct netns_nftables {
1313
struct nft_af_info *inet;
1414
struct nft_af_info *arp;
1515
struct nft_af_info *bridge;
16+
unsigned int base_seq;
1617
u8 gencursor;
17-
u8 genctr;
1818
};
1919

2020
#endif

0 commit comments

Comments
 (0)