openvswitch: load NAT helper

fleitner · davem330 · commit 17c357efe5ec · 2018-10-04T21:45:16.000-07:00
Load the respective NAT helper module if the flow uses it.

Signed-off-by: Flavio Leitner &lt;fbl@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
@@ -1312,6 +1312,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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1312,6 +1312,10 @@ static int ovs_ct_add_helper(struct ovs_conntrack_info info, const char name,`
`1312`	`1312`
`1313`	`1313`	`rcu_assign_pointer(help->helper, helper);`
`1314`	`1314`	`info->helper = helper;`
	`1315`	`+`
	`1316`	`+ if (info->nat)`
	`1317`	`+ request_module("ip_nat_%s", name);`
	`1318`	`+`
`1315`	`1319`	`return 0;`
`1316`	`1320`	`}`
`1317`	`1321`