]> git.proxmox.com Git - mirror_ovs.git/commit
datapath: Pass nf_hook_state to nf_conntrack_in()
authorFlorian Westphal <fw@strlen.de>
Fri, 10 May 2019 19:30:09 +0000 (12:30 -0700)
committerBen Pfaff <blp@ovn.org>
Fri, 10 May 2019 19:57:44 +0000 (12:57 -0700)
commit4fdec8986a203b0dc9d9c183c932826967572e0f
tree725335117b7ebb22a4103cf979690a6369ba0426
parent945d6d1c119af9e720c28fdfe3e303bfde0b29da
datapath: Pass nf_hook_state to nf_conntrack_in()

Upstream Commit:
    commit 93e66024b0249cec81e91328c55a754efd3192e0
    Author: Florian Westphal <fw@strlen.de>
    Date:   Wed Sep 12 15:19:07 2018 +0200

    netfilter: conntrack: pass nf_hook_state to packet and error handlers

    nf_hook_state contains all the hook meta-information: netns, protocol family,
    hook location, and so on.

    Instead of only passing selected information, pass a pointer to entire
    structure.

    This will allow to merge the error and the packet handlers and remove
    the ->new() function in followup patches.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This patch backports the above upstream patch to OVS and fixes compiling
errors on RHEL kernels.

Cc: Florian Westphal <fw@strlen.de>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
acinclude.m4
datapath/conntrack.c
datapath/linux/Modules.mk
datapath/linux/compat/include/linux/netfilter.h [new file with mode: 0644]
datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h