Thanks all, I'm considering rolling the following incremental into this patch, does this make sense?
looks good to me ~~
diff --git a/datapath/linux/compat/ip_fragment.c b/datapath/linux/compat/ip_fragment.c index efa86fcfae1b..de08f6c6744e 100644 --- a/datapath/linux/compat/ip_fragment.c +++ b/datapath/linux/compat/ip_fragment.c @@ -732,9 +732,7 @@ int rpl_ip_defrag(struct net *net, struct sk_buff *skb, u32 user) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) static int __net_init ipv4_frags_init_net(struct net *net) { - nf_defrag_ipv4_enable(net); - - return 0; + return nf_defrag_ipv4_enable(net); } #endifdiff --git a/datapath/linux/compat/nf_conntrack_reasm.c b/datapath/linux/compat/nf_conntrack_reasm.c index cb6da6c64e05..5832fead800e 100644 --- a/datapath/linux/compat/nf_conntrack_reasm.c +++ b/datapath/linux/compat/nf_conntrack_reasm.c @@ -561,9 +561,7 @@ out_unlock: #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) static int nf_ct_net_init(struct net *net) { - nf_defrag_ipv6_enable(net); - - return 0; + return nf_defrag_ipv6_enable(net); } #endif
_______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
