aboutsummaryrefslogtreecommitdiffstats
path: root/netlink
diff options
context:
space:
mode:
authorPierre Pfister <ppfister@cisco.com>2017-04-05 06:29:08 +0000
committerGerrit Code Review <gerrit@fd.io>2017-04-05 06:29:08 +0000
commit3b7e3000cea0643be5c809eb11da512cdd99990a (patch)
tree9fc2c7f23105e1a065f4d5a8faa71345ad6614fd /netlink
parentd9f6186fc27e47fcb30fc3e2463215493fb33cb4 (diff)
parentffd582515ce0e12b11c0d23e080ff64c20301073 (diff)
Merge "FIx compile issue for netlink and router plugin"
Diffstat (limited to 'netlink')
-rw-r--r--netlink/librtnl/mapper.c6
-rw-r--r--netlink/netlink.mk32
-rw-r--r--netlink/test/test.c13
3 files changed, 13 insertions, 38 deletions
diff --git a/netlink/librtnl/mapper.c b/netlink/librtnl/mapper.c
index b82fae8..65cc13a 100644
--- a/netlink/librtnl/mapper.c
+++ b/netlink/librtnl/mapper.c
@@ -96,7 +96,8 @@ int mapper_add_del_route(mapper_ns_t *ns, ns_route_t *route, int del)
fib_table_entry_path_add (ns->v6fib_index, &prefix, FIB_SOURCE_API,
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
&nh, map->sw_if_index, ns->v6fib_index,
- 0 /* weight */, MPLS_LABEL_INVALID,
+ 0 /* weight */,
+ (mpls_label_t *) MPLS_LABEL_INVALID,
FIB_ROUTE_PATH_FLAG_NONE);
#endif /* FIB_VERSION == 1 */
} else {
@@ -126,7 +127,8 @@ int mapper_add_del_route(mapper_ns_t *ns, ns_route_t *route, int del)
fib_table_entry_path_add (ns->v4fib_index, &prefix, FIB_SOURCE_API,
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
&nh, map->sw_if_index, ns->v4fib_index,
- 0 /* weight */, MPLS_LABEL_INVALID,
+ 0 /* weight */,
+ (mpls_label_t *) MPLS_LABEL_INVALID,
FIB_ROUTE_PATH_FLAG_NONE);
#endif /* FIB_VERSION == 1 */
}
diff --git a/netlink/netlink.mk b/netlink/netlink.mk
index 677a1b5..610205f 100644
--- a/netlink/netlink.mk
+++ b/netlink/netlink.mk
@@ -1,31 +1,5 @@
-netlink_configure_depend = \
- vppinfra-install \
- dpdk-install \
- svm-install \
- vlib-api-install \
- vlib-install \
- vnet-install \
- vpp-install \
- vpp-api-test-install
+netlink_configure_depend = vpp-install
-netlink_CPPFLAGS = $(call installed_includes_fn, \
- vppinfra \
- dpdk \
- openssl \
- svm \
- vlib \
- vlib-api \
- vnet \
- vpp \
- vpp-api-test)
+netlink_CPPFLAGS = $(call installed_includes_fn, vpp)
-netlink_LDFLAGS = $(call installed_libs_fn, \
- vppinfra \
- dpdk \
- openssl \
- svm \
- vlib \
- vlib-api \
- vnet \
- vpp \
- vpp-api-test)
+netlink_LDFLAGS = $(call installed_libs_fn, vpp)
diff --git a/netlink/test/test.c b/netlink/test/test.c
index 96f49f8..2922a40 100644
--- a/netlink/test/test.c
+++ b/netlink/test/test.c
@@ -200,11 +200,10 @@ VLIB_CLI_COMMAND (mapper_iface_command, static) = {
.function = mapper_iface_command_fn,
};
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
- int from_early_init)
-{
- clib_warning("Loaded module");
- return 0;
-}
+/* *INDENT-OFF* */
+VLIB_PLUGIN_REGISTER () = {
+ // .version = VPP_BUILD_VER, FIXME
+ .description = "netlink",
+};
+/* *INDENT-ON* */