diff options
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r-- | net/openvswitch/datapath.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 015e24e08909..a61818e94396 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -2288,6 +2288,9 @@ static struct genl_family * const dp_genl_families[] = { | |||
2288 | &dp_flow_genl_family, | 2288 | &dp_flow_genl_family, |
2289 | &dp_packet_genl_family, | 2289 | &dp_packet_genl_family, |
2290 | &dp_meter_genl_family, | 2290 | &dp_meter_genl_family, |
2291 | #if IS_ENABLED(CONFIG_NETFILTER_CONNCOUNT) | ||
2292 | &dp_ct_limit_genl_family, | ||
2293 | #endif | ||
2291 | }; | 2294 | }; |
2292 | 2295 | ||
2293 | static void dp_unregister_genl(int n_families) | 2296 | static void dp_unregister_genl(int n_families) |
@@ -2323,8 +2326,7 @@ static int __net_init ovs_init_net(struct net *net) | |||
2323 | 2326 | ||
2324 | INIT_LIST_HEAD(&ovs_net->dps); | 2327 | INIT_LIST_HEAD(&ovs_net->dps); |
2325 | INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq); | 2328 | INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq); |
2326 | ovs_ct_init(net); | 2329 | return ovs_ct_init(net); |
2327 | return 0; | ||
2328 | } | 2330 | } |
2329 | 2331 | ||
2330 | static void __net_exit list_vports_from_net(struct net *net, struct net *dnet, | 2332 | static void __net_exit list_vports_from_net(struct net *net, struct net *dnet, |
@@ -2469,3 +2471,4 @@ MODULE_ALIAS_GENL_FAMILY(OVS_VPORT_FAMILY); | |||
2469 | MODULE_ALIAS_GENL_FAMILY(OVS_FLOW_FAMILY); | 2471 | MODULE_ALIAS_GENL_FAMILY(OVS_FLOW_FAMILY); |
2470 | MODULE_ALIAS_GENL_FAMILY(OVS_PACKET_FAMILY); | 2472 | MODULE_ALIAS_GENL_FAMILY(OVS_PACKET_FAMILY); |
2471 | MODULE_ALIAS_GENL_FAMILY(OVS_METER_FAMILY); | 2473 | MODULE_ALIAS_GENL_FAMILY(OVS_METER_FAMILY); |
2474 | MODULE_ALIAS_GENL_FAMILY(OVS_CT_LIMIT_FAMILY); | ||