Message ID | 1544036152-27247-8-git-send-email-gvrose8192@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | datapath: Pull in upstream fixes and updates | expand |
On Wed, Dec 05, 2018 at 10:55:51AM -0800, Greg Rose wrote: > From: Flavio Leitner <fbl@redhat.com> > > Upstream commit: > commit 17c357efe5eceebdc3971a48b3d4d61a03c1178b > Author: Flavio Leitner <fbl@redhat.com> > Date: Fri Sep 28 14:51:28 2018 -0300 > > openvswitch: load NAT helper > > Load the respective NAT helper module if the flow uses it. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > CC: Flavio Leitner <fbl@redhat.com> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- Acked-by: Flavio Leitner <fbl@sysclose.org>
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index c6e731b..952b6ad 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -1370,6 +1370,10 @@ static int ovs_ct_add_helper(struct ovs_conntrack_info *info, const char *name, rcu_assign_pointer(help->helper, helper); info->helper = helper; + + if (info->nat) + request_module("ip_nat_%s", name); + return 0; }