Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for your net-next tree, they are: 1) Remove obsolete nf_log tracing from nf_tables, from Florian Westphal. 2) Add support for map lookups to numgen, random and hash expressions, from Laura Garcia. 3) Allow to register nat hooks for iptables and nftables at the same time. Patchset from Florian Westpha. 4) Timeout support for rbtree sets. 5) ip6_rpfilter works needs interface for link-local addresses, from Vincent Bernat. 6) Add nf_ct_hook and nf_nat_hook structures and use them. 7) Do not drop packets on packets raceing to insert conntrack entries into hashes, this is particularly a problem in nfqueue setups. 8) Address fallout from xt_osf separation to nf_osf, patches from Florian Westphal and Fernando Mancera. 9) Remove reference to struct nft_af_info, which doesn't exist anymore. From Taehee Yoo. This batch comes with is a conflict between 25fd386e0bc0 ("netfilter: core: add missing __rcu annotation") in your tree and 2c205dd3981f ("netfilter: add struct nf_nat_hook and use it") coming in this batch. This conflict can be solved by leaving the __rcu tag on __netfilter_net_init() - added by 25fd386e0bc0 - and remove all code related to nf_nat_decode_session_hook - which is gone after 2c205dd3981f, as described by: diff --cc net/netfilter/core.c index e0ae4aae96f5,206fb2c4c319..168af54db975 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@@ -611,7 -580,13 +611,8 @@@ const struct nf_conntrack_zone nf_ct_zo EXPORT_SYMBOL_GPL(nf_ct_zone_dflt); #endif /* CONFIG_NF_CONNTRACK */ - static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max) -#ifdef CONFIG_NF_NAT_NEEDED -void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *); -EXPORT_SYMBOL(nf_nat_decode_session_hook); -#endif - + static void __net_init + __netfilter_net_init(struct nf_hook_entries __rcu **e, int max) { int h; I can also merge your net-next tree into nf-next, solve the conflict and resend the pull request if you prefer so. ====================
Showing the changes to include/uapi/linux (2 of 30 files). Show all
Unified · Split
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | #ifndef _NF_OSF_H |
| 2 | 2 | #define _NF_OSF_H |
| 3 | 3 | |
| 4 | +#include <linux/types.h> | |
| 5 | + | |
| 4 | 6 | #define MAXGENRELEN 32 |
| 5 | 7 | |
| 6 | 8 | #define NF_OSF_GENRE (1 << 0) |
| @@ -57,12 +59,6 @@ struct nf_osf_user_finger { · 50 unmodified lines | ||
| 57 | 59 | struct nf_osf_opt opt[MAX_IPOPTLEN]; |
| 58 | 60 | }; |
| 59 | 61 | |
| 60 | −struct nf_osf_finger { | |
| 61 | − struct rcu_head rcu_head; | |
| 62 | − struct list_head finger_entry; | |
| 63 | − struct nf_osf_user_finger finger; | |
| 64 | −}; | |
| 65 | − | |
| 66 | 62 | struct nf_osf_nlmsg { |
| 67 | 63 | struct nf_osf_user_finger f; |
| 68 | 64 | struct iphdr ip; |
| @@ -856,6 +856,8 @@ enum nft_hash_types { · 855 unmodified lines | ||
| 856 | 856 | * @NFTA_HASH_SEED: seed value (NLA_U32) |
| 857 | 857 | * @NFTA_HASH_OFFSET: add this offset value to hash result (NLA_U32) |
| 858 | 858 | * @NFTA_HASH_TYPE: hash operation (NLA_U32: nft_hash_types) |
| 859 | + * @NFTA_HASH_SET_NAME: name of the map to lookup (NLA_STRING) | |
| 860 | + * @NFTA_HASH_SET_ID: id of the map (NLA_U32) | |
| 859 | 861 | */ |
| 860 | 862 | enum nft_hash_attributes { |
| 861 | 863 | NFTA_HASH_UNSPEC, |
| @@ -866,6 +868,8 @@ enum nft_hash_attributes { · 4 unmodified lines | ||
| 866 | 868 | NFTA_HASH_SEED, |
| 867 | 869 | NFTA_HASH_OFFSET, |
| 868 | 870 | NFTA_HASH_TYPE, |
| 871 | + NFTA_HASH_SET_NAME, | |
| 872 | + NFTA_HASH_SET_ID, | |
| 869 | 873 | __NFTA_HASH_MAX, |
| 870 | 874 | }; |
| 871 | 875 | #define NFTA_HASH_MAX (__NFTA_HASH_MAX - 1) |