From b10ac772218afd4f296db866f6b80258e1d1ca8a Mon Sep 17 00:00:00 2001 From: Aaron Conole Date: Wed, 25 Jul 2018 14:22:31 -0400 Subject: [PATCH] dpif-netdev: Use compatible function type to fix broken build. The dpif_provder flow_dump_create function signature was changed, but the netdev dpif was not updated along with it. This generated a build error with the following warnings: libtool: compile: gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -fno-strict-aliasing -Wshadow -Wno-null-pointer-arithmetic -Werror -Werror -g -O2 -MT lib/dpif-netdev.lo -MD -MP -MF lib/.deps/dpif-netdev.Tpo -c lib/dpif-netdev.c -o lib/dpif-netdev.o lib/dpif-netdev.c:6812:5: error: initialization from incompatible pointer type [-Werror] dpif_netdev_flow_dump_create, ^ lib/dpif-netdev.c:6812:5: error: (near initialization for 'dpif_netdev_class.flow_dump_create') [-Werror] Fixes: ab15e70eb587 ("dpctl: Expand the flow dump type filter") Cc: Gavi Teitz Cc: Roi Dayan Cc: Simon Horman Signed-off-by: Aaron Conole Signed-off-by: Ben Pfaff --- lib/dpif-netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 13a20f023..6c3736ef5 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3481,7 +3481,7 @@ dpif_netdev_flow_dump_cast(struct dpif_flow_dump *dump) static struct dpif_flow_dump * dpif_netdev_flow_dump_create(const struct dpif *dpif_, bool terse, - char *type OVS_UNUSED) + struct dpif_flow_dump_types *type OVS_UNUSED) { struct dpif_netdev_flow_dump *dump;