]> git.proxmox.com Git - mirror_ovs.git/commit - acinclude.m4
datapath: Use new header file net/ipv6_frag.h
authorFlorian Westphal <fw@strlen.de>
Fri, 10 May 2019 19:30:10 +0000 (12:30 -0700)
committerBen Pfaff <blp@ovn.org>
Fri, 10 May 2019 19:57:51 +0000 (12:57 -0700)
commit7857a9b4fcdb2679687b8a1a0e0f666ee3bbba6b
tree25dfa64edb1d7121a53716e0bebc35b776437372
parent4fdec8986a203b0dc9d9c183c932826967572e0f
datapath: Use new header file net/ipv6_frag.h

Upstream commit:
    commit 70b095c84326640eeacfd69a411db8fc36e8ab1a
    Author: Florian Westphal <fw@strlen.de>
    Date:   Sat Jul 14 01:14:01 2018 +0200

    ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module

    IPV6=m
    DEFRAG_IPV6=m
    CONNTRACK=y yields:

    net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get':
    net/netfilter/nf_conntrack_proto.c:802: undefined reference to `nf_defrag_ipv6_enable'
    net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference to `nf_conntrack_l4proto_icmpv6'

    Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params
    ip6_frag_init and ip6_expire_frag_queue so it would be needed to force
    IPV6=y too.

    This patch gets rid of the 'followup linker error' by removing
    the dependency of ipv6.ko symbols from netfilter ipv6 defrag.

    Shared code is placed into a header, then used from both.

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.

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/net/ipv6_frag.h [new file with mode: 0644]