1 files changed, 32 insertions, 16 deletions

diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index 34e4e638e65a..d454024ac5cb 100644
--- a/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -734,28 +734,44 @@ dyn_destroy(struct ip_fw_chain *ch, struct named_object *no)
 
 static struct opcode_obj_rewrite dyn_opcodes[] = {
 	{
-		O_KEEP_STATE, IPFW_TLV_STATE_NAME,
-		dyn_classify, dyn_update,
-		dyn_findbyname, dyn_findbykidx,
-		dyn_create, dyn_destroy
+		.opcode = O_KEEP_STATE,
+		.etlv = IPFW_TLV_STATE_NAME,
+		.classifier = dyn_classify,
+		.update = dyn_update,
+		.find_byname = dyn_findbyname,
+		.find_bykidx = dyn_findbykidx,
+		.create_object = dyn_create,
+		.destroy_object = dyn_destroy,
 	},
 	{
-		O_CHECK_STATE, IPFW_TLV_STATE_NAME,
-		dyn_classify, dyn_update,
-		dyn_findbyname, dyn_findbykidx,
-		dyn_create, dyn_destroy
+		.opcode = O_CHECK_STATE,
+		.etlv = IPFW_TLV_STATE_NAME,
+		.classifier = dyn_classify,
+		.update = dyn_update,
+		.find_byname = dyn_findbyname,
+		.find_bykidx = dyn_findbykidx,
+		.create_object = dyn_create,
+		.destroy_object = dyn_destroy,
 	},
 	{
-		O_PROBE_STATE, IPFW_TLV_STATE_NAME,
-		dyn_classify, dyn_update,
-		dyn_findbyname, dyn_findbykidx,
-		dyn_create, dyn_destroy
+		.opcode = O_PROBE_STATE,
+		.etlv = IPFW_TLV_STATE_NAME,
+		.classifier = dyn_classify,
+		.update = dyn_update,
+		.find_byname = dyn_findbyname,
+		.find_bykidx = dyn_findbykidx,
+		.create_object = dyn_create,
+		.destroy_object = dyn_destroy,
 	},
 	{
-		O_LIMIT, IPFW_TLV_STATE_NAME,
-		dyn_classify, dyn_update,
-		dyn_findbyname, dyn_findbykidx,
-		dyn_create, dyn_destroy
+		.opcode = O_LIMIT,
+		.etlv = IPFW_TLV_STATE_NAME,
+		.classifier = dyn_classify,
+		.update = dyn_update,
+		.find_byname = dyn_findbyname,
+		.find_bykidx = dyn_findbykidx,
+		.create_object = dyn_create,
+		.destroy_object = dyn_destroy,
 	},
 };