diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-10-11 08:29:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-10-11 08:29:45 +0000 |
| commit | 91304b8cb75df7cb516518b53e3c1156d0f27ba5 (patch) | |
| tree | d5318f7166555a84f4067183e258655af64cd6d1 /ctrl | |
| parent | 691b16435dbc0b8e53376a62683e792d0f25cc66 (diff) | |
| parent | 359a384cde480a0206d1ae45709ad1c1e7141477 (diff) | |
Merge "[HICN-309] [network_framework] rules are now implemented by the core"
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/facemgr/src/api.c | 1 | ||||
| -rw-r--r-- | ctrl/facemgr/src/interfaces/network_framework/network_framework.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/ctrl/facemgr/src/api.c b/ctrl/facemgr/src/api.c index f630792c4..88595a9bc 100644 --- a/ctrl/facemgr/src/api.c +++ b/ctrl/facemgr/src/api.c @@ -1279,7 +1279,6 @@ facemgr_bootstrap(facemgr_t * facemgr) #ifdef __APPLE__ network_framework_cfg_t nf_cfg = { - .rules = &facemgr->rules, }; rc = facemgr_create_interface(facemgr, "nf", "network_framework", &nf_cfg, &facemgr->nf); if (rc < 0) { diff --git a/ctrl/facemgr/src/interfaces/network_framework/network_framework.c b/ctrl/facemgr/src/interfaces/network_framework/network_framework.c index 4a9d24f61..ed2f88e9e 100644 --- a/ctrl/facemgr/src/interfaces/network_framework/network_framework.c +++ b/ctrl/facemgr/src/interfaces/network_framework/network_framework.c @@ -529,11 +529,6 @@ int nf_initialize(interface_t * interface, void * cfg) if (!data) goto ERR_MALLOC; - if (cfg) - data->cfg = * (network_framework_cfg_t *)cfg; - else - data->cfg.rules = NULL; - data->pm = nw_path_monitor_create(); if (!data->pm) goto ERR_PM; |