On Fri, Dec 06, 2013 at 12:24:12AM +0100, Eric Leblond wrote:
> This patch prepares the adding of nft_queue module by putting
> reusable code into a header file.
>
> Signed-off-by: Eric Leblond <eric@xxxxxxxxx>
> ---
> include/net/netfilter/nf_queue.h | 63 +++++++++++++++++++++++++++++++++
> net/netfilter/xt_NFQUEUE.c | 75 +++++-----------------------------------
> 2 files changed, 71 insertions(+), 67 deletions(-)
>
> diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
> index c1d5b3e..0a71ab0 100644
> --- a/include/net/netfilter/nf_queue.h
> +++ b/include/net/netfilter/nf_queue.h
This header file is also used by net/netfilter/nfnetlink_queue_core,
then...
> @@ -1,6 +1,10 @@
> #ifndef _NF_QUEUE_H
> #define _NF_QUEUE_H
>
> +#include <linux/ip.h>
> +#include <linux/ipv6.h>
> +#include <linux/jhash.h>
> +
> /* Each queued (to userspace) skbuff has one of these. */
> struct nf_queue_entry {
> struct list_head list;
> @@ -33,4 +37,63 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
> bool nf_queue_entry_get_refs(struct nf_queue_entry *entry);
> void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
>
> +static u32 jhash_initval __read_mostly;
This variable will be also reserved in that module as well. I have
fixed this by adding a jhash_initval parameter to init_hashrandom,
hash_v4, hash_v6 and nfqueue_hash.
Please, no need to send a new patchset, check my nftables tree and
tell if you find any issue, otherwise I'll pull these changes to
nf-next. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
