diff --git a/generated/Makefile b/generated/Makefile
index 201df91..ea98a49 100644
--- a/generated/Makefile
+++ b/generated/Makefile
@@ -16,7 +16,7 @@ TOOL:=../ynl-gen-cpp.py
 GENS_PATHS=$(shell grep -nrI --files-without-match \
 		'protocol: netlink' ../Documentation/netlink/specs/)
 GENS_ALL=$(patsubst ../Documentation/netlink/specs/%.yaml,%,${GENS_PATHS})
-GENS=$(filter-out devlink ovs_datapath ovs_flow ovs_vport nlctrl,${GENS_ALL})
+GENS=rt-addr $(filter-out devlink ovs_datapath ovs_flow ovs_vport nlctrl,${GENS_ALL})
 SRCS=$(patsubst %,%-user.cpp,${GENS})
 HDRS=$(patsubst %,%-user.hpp,${GENS})
 OBJS=$(patsubst %,%-user.cpp.o,${GENS})
diff --git a/generated/dpll-user.cpp b/generated/dpll-user.cpp
index 8a7f114..d295fb2 100644
--- a/generated/dpll-user.cpp
+++ b/generated/dpll-user.cpp
@@ -542,7 +542,7 @@ int dpll_device_id_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<dpll_device_id_get_rsp>
-dpll_device_id_get(ynl_cpp::ynl_socket&  ys, dpll_device_id_get_req& req)
+dpll_device_id_get(ynl_cpp::ynl_socket& ys, dpll_device_id_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<dpll_device_id_get_rsp> rsp;
@@ -646,7 +646,7 @@ int dpll_device_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<dpll_device_get_rsp>
-dpll_device_get(ynl_cpp::ynl_socket&  ys, dpll_device_get_req& req)
+dpll_device_get(ynl_cpp::ynl_socket& ys, dpll_device_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<dpll_device_get_rsp> rsp;
@@ -674,7 +674,7 @@ dpll_device_get(ynl_cpp::ynl_socket&  ys, dpll_device_get_req& req)
 
 /* DPLL_CMD_DEVICE_GET - dump */
 std::unique_ptr<dpll_device_get_list>
-dpll_device_get_dump(ynl_cpp::ynl_socket&  ys)
+dpll_device_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -700,7 +700,7 @@ dpll_device_get_dump(ynl_cpp::ynl_socket&  ys)
 /* DPLL_CMD_DEVICE_GET - notify */
 /* ============== DPLL_CMD_DEVICE_SET ============== */
 /* DPLL_CMD_DEVICE_SET - do */
-int dpll_device_set(ynl_cpp::ynl_socket&  ys, dpll_device_set_req& req)
+int dpll_device_set(ynl_cpp::ynl_socket& ys, dpll_device_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -745,7 +745,7 @@ int dpll_pin_id_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<dpll_pin_id_get_rsp>
-dpll_pin_id_get(ynl_cpp::ynl_socket&  ys, dpll_pin_id_get_req& req)
+dpll_pin_id_get(ynl_cpp::ynl_socket& ys, dpll_pin_id_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<dpll_pin_id_get_rsp> rsp;
@@ -948,7 +948,7 @@ int dpll_pin_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<dpll_pin_get_rsp>
-dpll_pin_get(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req& req)
+dpll_pin_get(ynl_cpp::ynl_socket& ys, dpll_pin_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<dpll_pin_get_rsp> rsp;
@@ -976,7 +976,7 @@ dpll_pin_get(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req& req)
 
 /* DPLL_CMD_PIN_GET - dump */
 std::unique_ptr<dpll_pin_get_list>
-dpll_pin_get_dump(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req_dump& req)
+dpll_pin_get_dump(ynl_cpp::ynl_socket& ys, dpll_pin_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -1006,7 +1006,7 @@ dpll_pin_get_dump(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req_dump& req)
 /* DPLL_CMD_PIN_GET - notify */
 /* ============== DPLL_CMD_PIN_SET ============== */
 /* DPLL_CMD_PIN_SET - do */
-int dpll_pin_set(ynl_cpp::ynl_socket&  ys, dpll_pin_set_req& req)
+int dpll_pin_set(ynl_cpp::ynl_socket& ys, dpll_pin_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
diff --git a/generated/dpll-user.hpp b/generated/dpll-user.hpp
index 969de60..63d983d 100644
--- a/generated/dpll-user.hpp
+++ b/generated/dpll-user.hpp
@@ -78,7 +78,7 @@ struct dpll_device_id_get_rsp {
 
  */
 std::unique_ptr<dpll_device_id_get_rsp>
-dpll_device_id_get(ynl_cpp::ynl_socket&  ys, dpll_device_id_get_req& req);
+dpll_device_id_get(ynl_cpp::ynl_socket& ys, dpll_device_id_get_req& req);
 
 /* ============== DPLL_CMD_DEVICE_GET ============== */
 /* DPLL_CMD_DEVICE_GET - do */
@@ -104,7 +104,7 @@ struct dpll_device_get_rsp {
 
  */
 std::unique_ptr<dpll_device_get_rsp>
-dpll_device_get(ynl_cpp::ynl_socket&  ys, dpll_device_get_req& req);
+dpll_device_get(ynl_cpp::ynl_socket& ys, dpll_device_get_req& req);
 
 /* DPLL_CMD_DEVICE_GET - dump */
 struct dpll_device_get_list {
@@ -112,7 +112,7 @@ struct dpll_device_get_list {
 };
 
 std::unique_ptr<dpll_device_get_list>
-dpll_device_get_dump(ynl_cpp::ynl_socket&  ys);
+dpll_device_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* DPLL_CMD_DEVICE_GET - notify */
 struct dpll_device_get_ntf {
@@ -128,7 +128,7 @@ struct dpll_device_set_req {
 /*
  * Set attributes for a DPLL device
  */
-int dpll_device_set(ynl_cpp::ynl_socket&  ys, dpll_device_set_req& req);
+int dpll_device_set(ynl_cpp::ynl_socket& ys, dpll_device_set_req& req);
 
 /* ============== DPLL_CMD_PIN_ID_GET ============== */
 /* DPLL_CMD_PIN_ID_GET - do */
@@ -150,7 +150,7 @@ struct dpll_pin_id_get_rsp {
 
  */
 std::unique_ptr<dpll_pin_id_get_rsp>
-dpll_pin_id_get(ynl_cpp::ynl_socket&  ys, dpll_pin_id_get_req& req);
+dpll_pin_id_get(ynl_cpp::ynl_socket& ys, dpll_pin_id_get_req& req);
 
 /* ============== DPLL_CMD_PIN_GET ============== */
 /* DPLL_CMD_PIN_GET - do */
@@ -190,7 +190,7 @@ struct dpll_pin_get_rsp {
 
  */
 std::unique_ptr<dpll_pin_get_rsp>
-dpll_pin_get(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req& req);
+dpll_pin_get(ynl_cpp::ynl_socket& ys, dpll_pin_get_req& req);
 
 /* DPLL_CMD_PIN_GET - dump */
 struct dpll_pin_get_req_dump {
@@ -202,7 +202,7 @@ struct dpll_pin_get_list {
 };
 
 std::unique_ptr<dpll_pin_get_list>
-dpll_pin_get_dump(ynl_cpp::ynl_socket&  ys, dpll_pin_get_req_dump& req);
+dpll_pin_get_dump(ynl_cpp::ynl_socket& ys, dpll_pin_get_req_dump& req);
 
 /* DPLL_CMD_PIN_GET - notify */
 struct dpll_pin_get_ntf {
@@ -226,7 +226,7 @@ struct dpll_pin_set_req {
 /*
  * Set attributes of a target pin
  */
-int dpll_pin_set(ynl_cpp::ynl_socket&  ys, dpll_pin_set_req& req);
+int dpll_pin_set(ynl_cpp::ynl_socket& ys, dpll_pin_set_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_DPLL_GEN_H */
diff --git a/generated/ethtool-user.cpp b/generated/ethtool-user.cpp
index 55dc01e..6851e22 100644
--- a/generated/ethtool-user.cpp
+++ b/generated/ethtool-user.cpp
@@ -2904,7 +2904,7 @@ int ethtool_strset_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_strset_get_rsp>
-ethtool_strset_get(ynl_cpp::ynl_socket&  ys, ethtool_strset_get_req& req)
+ethtool_strset_get(ynl_cpp::ynl_socket& ys, ethtool_strset_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_strset_get_rsp> rsp;
@@ -2936,7 +2936,7 @@ ethtool_strset_get(ynl_cpp::ynl_socket&  ys, ethtool_strset_get_req& req)
 
 /* ETHTOOL_MSG_STRSET_GET - dump */
 std::unique_ptr<ethtool_strset_get_list>
-ethtool_strset_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_strset_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_strset_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3018,7 +3018,7 @@ int ethtool_linkinfo_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_linkinfo_get_rsp>
-ethtool_linkinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_linkinfo_get_req& req)
+ethtool_linkinfo_get(ynl_cpp::ynl_socket& ys, ethtool_linkinfo_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_linkinfo_get_rsp> rsp;
@@ -3046,7 +3046,7 @@ ethtool_linkinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_linkinfo_get_req& req)
 
 /* ETHTOOL_MSG_LINKINFO_GET - dump */
 std::unique_ptr<ethtool_linkinfo_get_list>
-ethtool_linkinfo_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkinfo_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_linkinfo_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3077,7 +3077,7 @@ ethtool_linkinfo_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_LINKINFO_GET - notify */
 /* ============== ETHTOOL_MSG_LINKINFO_SET ============== */
 /* ETHTOOL_MSG_LINKINFO_SET - do */
-int ethtool_linkinfo_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_linkinfo_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_linkinfo_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -3181,7 +3181,7 @@ int ethtool_linkmodes_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_linkmodes_get_rsp>
-ethtool_linkmodes_get(ynl_cpp::ynl_socket&  ys, ethtool_linkmodes_get_req& req)
+ethtool_linkmodes_get(ynl_cpp::ynl_socket& ys, ethtool_linkmodes_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_linkmodes_get_rsp> rsp;
@@ -3209,7 +3209,7 @@ ethtool_linkmodes_get(ynl_cpp::ynl_socket&  ys, ethtool_linkmodes_get_req& req)
 
 /* ETHTOOL_MSG_LINKMODES_GET - dump */
 std::unique_ptr<ethtool_linkmodes_get_list>
-ethtool_linkmodes_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkmodes_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_linkmodes_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3240,7 +3240,7 @@ ethtool_linkmodes_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_LINKMODES_GET - notify */
 /* ============== ETHTOOL_MSG_LINKMODES_SET ============== */
 /* ETHTOOL_MSG_LINKMODES_SET - do */
-int ethtool_linkmodes_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_linkmodes_set(ynl_cpp::ynl_socket& ys,
 			  ethtool_linkmodes_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -3332,7 +3332,7 @@ int ethtool_linkstate_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_linkstate_get_rsp>
-ethtool_linkstate_get(ynl_cpp::ynl_socket&  ys, ethtool_linkstate_get_req& req)
+ethtool_linkstate_get(ynl_cpp::ynl_socket& ys, ethtool_linkstate_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_linkstate_get_rsp> rsp;
@@ -3360,7 +3360,7 @@ ethtool_linkstate_get(ynl_cpp::ynl_socket&  ys, ethtool_linkstate_get_req& req)
 
 /* ETHTOOL_MSG_LINKSTATE_GET - dump */
 std::unique_ptr<ethtool_linkstate_get_list>
-ethtool_linkstate_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkstate_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_linkstate_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3426,7 +3426,7 @@ int ethtool_debug_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_debug_get_rsp>
-ethtool_debug_get(ynl_cpp::ynl_socket&  ys, ethtool_debug_get_req& req)
+ethtool_debug_get(ynl_cpp::ynl_socket& ys, ethtool_debug_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_debug_get_rsp> rsp;
@@ -3454,7 +3454,7 @@ ethtool_debug_get(ynl_cpp::ynl_socket&  ys, ethtool_debug_get_req& req)
 
 /* ETHTOOL_MSG_DEBUG_GET - dump */
 std::unique_ptr<ethtool_debug_get_list>
-ethtool_debug_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_debug_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_debug_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3485,7 +3485,7 @@ ethtool_debug_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_DEBUG_GET - notify */
 /* ============== ETHTOOL_MSG_DEBUG_SET ============== */
 /* ETHTOOL_MSG_DEBUG_SET - do */
-int ethtool_debug_set(ynl_cpp::ynl_socket&  ys, ethtool_debug_set_req& req)
+int ethtool_debug_set(ynl_cpp::ynl_socket& ys, ethtool_debug_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -3550,7 +3550,7 @@ int ethtool_wol_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_wol_get_rsp>
-ethtool_wol_get(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req& req)
+ethtool_wol_get(ynl_cpp::ynl_socket& ys, ethtool_wol_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_wol_get_rsp> rsp;
@@ -3578,7 +3578,7 @@ ethtool_wol_get(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req& req)
 
 /* ETHTOOL_MSG_WOL_GET - dump */
 std::unique_ptr<ethtool_wol_get_list>
-ethtool_wol_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req_dump& req)
+ethtool_wol_get_dump(ynl_cpp::ynl_socket& ys, ethtool_wol_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -3608,7 +3608,7 @@ ethtool_wol_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req_dump& req)
 /* ETHTOOL_MSG_WOL_GET - notify */
 /* ============== ETHTOOL_MSG_WOL_SET ============== */
 /* ETHTOOL_MSG_WOL_SET - do */
-int ethtool_wol_set(ynl_cpp::ynl_socket&  ys, ethtool_wol_set_req& req)
+int ethtool_wol_set(ynl_cpp::ynl_socket& ys, ethtool_wol_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -3693,7 +3693,7 @@ int ethtool_features_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_features_get_rsp>
-ethtool_features_get(ynl_cpp::ynl_socket&  ys, ethtool_features_get_req& req)
+ethtool_features_get(ynl_cpp::ynl_socket& ys, ethtool_features_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_features_get_rsp> rsp;
@@ -3721,7 +3721,7 @@ ethtool_features_get(ynl_cpp::ynl_socket&  ys, ethtool_features_get_req& req)
 
 /* ETHTOOL_MSG_FEATURES_GET - dump */
 std::unique_ptr<ethtool_features_get_list>
-ethtool_features_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_features_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_features_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3812,7 +3812,7 @@ int ethtool_features_set_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_features_set_rsp>
-ethtool_features_set(ynl_cpp::ynl_socket&  ys, ethtool_features_set_req& req)
+ethtool_features_set(ynl_cpp::ynl_socket& ys, ethtool_features_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_features_set_rsp> rsp;
@@ -3884,7 +3884,7 @@ int ethtool_privflags_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_privflags_get_rsp>
-ethtool_privflags_get(ynl_cpp::ynl_socket&  ys, ethtool_privflags_get_req& req)
+ethtool_privflags_get(ynl_cpp::ynl_socket& ys, ethtool_privflags_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_privflags_get_rsp> rsp;
@@ -3912,7 +3912,7 @@ ethtool_privflags_get(ynl_cpp::ynl_socket&  ys, ethtool_privflags_get_req& req)
 
 /* ETHTOOL_MSG_PRIVFLAGS_GET - dump */
 std::unique_ptr<ethtool_privflags_get_list>
-ethtool_privflags_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_privflags_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_privflags_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3943,7 +3943,7 @@ ethtool_privflags_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_PRIVFLAGS_GET - notify */
 /* ============== ETHTOOL_MSG_PRIVFLAGS_SET ============== */
 /* ETHTOOL_MSG_PRIVFLAGS_SET - do */
-int ethtool_privflags_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_privflags_set(ynl_cpp::ynl_socket& ys,
 			  ethtool_privflags_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -4063,7 +4063,7 @@ int ethtool_rings_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_rings_get_rsp>
-ethtool_rings_get(ynl_cpp::ynl_socket&  ys, ethtool_rings_get_req& req)
+ethtool_rings_get(ynl_cpp::ynl_socket& ys, ethtool_rings_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_rings_get_rsp> rsp;
@@ -4091,7 +4091,7 @@ ethtool_rings_get(ynl_cpp::ynl_socket&  ys, ethtool_rings_get_req& req)
 
 /* ETHTOOL_MSG_RINGS_GET - dump */
 std::unique_ptr<ethtool_rings_get_list>
-ethtool_rings_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_rings_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_rings_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -4122,7 +4122,7 @@ ethtool_rings_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_RINGS_GET - notify */
 /* ============== ETHTOOL_MSG_RINGS_SET ============== */
 /* ETHTOOL_MSG_RINGS_SET - do */
-int ethtool_rings_set(ynl_cpp::ynl_socket&  ys, ethtool_rings_set_req& req)
+int ethtool_rings_set(ynl_cpp::ynl_socket& ys, ethtool_rings_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -4237,7 +4237,7 @@ int ethtool_channels_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_channels_get_rsp>
-ethtool_channels_get(ynl_cpp::ynl_socket&  ys, ethtool_channels_get_req& req)
+ethtool_channels_get(ynl_cpp::ynl_socket& ys, ethtool_channels_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_channels_get_rsp> rsp;
@@ -4265,7 +4265,7 @@ ethtool_channels_get(ynl_cpp::ynl_socket&  ys, ethtool_channels_get_req& req)
 
 /* ETHTOOL_MSG_CHANNELS_GET - dump */
 std::unique_ptr<ethtool_channels_get_list>
-ethtool_channels_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_channels_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_channels_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -4296,7 +4296,7 @@ ethtool_channels_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_CHANNELS_GET - notify */
 /* ============== ETHTOOL_MSG_CHANNELS_SET ============== */
 /* ETHTOOL_MSG_CHANNELS_SET - do */
-int ethtool_channels_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_channels_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_channels_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -4486,7 +4486,7 @@ int ethtool_coalesce_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_coalesce_get_rsp>
-ethtool_coalesce_get(ynl_cpp::ynl_socket&  ys, ethtool_coalesce_get_req& req)
+ethtool_coalesce_get(ynl_cpp::ynl_socket& ys, ethtool_coalesce_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_coalesce_get_rsp> rsp;
@@ -4514,7 +4514,7 @@ ethtool_coalesce_get(ynl_cpp::ynl_socket&  ys, ethtool_coalesce_get_req& req)
 
 /* ETHTOOL_MSG_COALESCE_GET - dump */
 std::unique_ptr<ethtool_coalesce_get_list>
-ethtool_coalesce_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_coalesce_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_coalesce_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -4545,7 +4545,7 @@ ethtool_coalesce_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_COALESCE_GET - notify */
 /* ============== ETHTOOL_MSG_COALESCE_SET ============== */
 /* ETHTOOL_MSG_COALESCE_SET - do */
-int ethtool_coalesce_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_coalesce_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_coalesce_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -4677,7 +4677,7 @@ int ethtool_pause_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_pause_get_rsp>
-ethtool_pause_get(ynl_cpp::ynl_socket&  ys, ethtool_pause_get_req& req)
+ethtool_pause_get(ynl_cpp::ynl_socket& ys, ethtool_pause_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_pause_get_rsp> rsp;
@@ -4705,7 +4705,7 @@ ethtool_pause_get(ynl_cpp::ynl_socket&  ys, ethtool_pause_get_req& req)
 
 /* ETHTOOL_MSG_PAUSE_GET - dump */
 std::unique_ptr<ethtool_pause_get_list>
-ethtool_pause_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_pause_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_pause_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -4736,7 +4736,7 @@ ethtool_pause_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_PAUSE_GET - notify */
 /* ============== ETHTOOL_MSG_PAUSE_SET ============== */
 /* ETHTOOL_MSG_PAUSE_SET - do */
-int ethtool_pause_set(ynl_cpp::ynl_socket&  ys, ethtool_pause_set_req& req)
+int ethtool_pause_set(ynl_cpp::ynl_socket& ys, ethtool_pause_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -4827,7 +4827,7 @@ int ethtool_eee_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_eee_get_rsp>
-ethtool_eee_get(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req& req)
+ethtool_eee_get(ynl_cpp::ynl_socket& ys, ethtool_eee_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_eee_get_rsp> rsp;
@@ -4855,7 +4855,7 @@ ethtool_eee_get(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req& req)
 
 /* ETHTOOL_MSG_EEE_GET - dump */
 std::unique_ptr<ethtool_eee_get_list>
-ethtool_eee_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req_dump& req)
+ethtool_eee_get_dump(ynl_cpp::ynl_socket& ys, ethtool_eee_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -4885,7 +4885,7 @@ ethtool_eee_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req_dump& req)
 /* ETHTOOL_MSG_EEE_GET - notify */
 /* ============== ETHTOOL_MSG_EEE_SET ============== */
 /* ETHTOOL_MSG_EEE_SET - do */
-int ethtool_eee_set(ynl_cpp::ynl_socket&  ys, ethtool_eee_set_req& req)
+int ethtool_eee_set(ynl_cpp::ynl_socket& ys, ethtool_eee_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -4998,7 +4998,7 @@ int ethtool_tsinfo_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_tsinfo_get_rsp>
-ethtool_tsinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_tsinfo_get_req& req)
+ethtool_tsinfo_get(ynl_cpp::ynl_socket& ys, ethtool_tsinfo_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_tsinfo_get_rsp> rsp;
@@ -5028,7 +5028,7 @@ ethtool_tsinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_tsinfo_get_req& req)
 
 /* ETHTOOL_MSG_TSINFO_GET - dump */
 std::unique_ptr<ethtool_tsinfo_get_list>
-ethtool_tsinfo_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tsinfo_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_tsinfo_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5060,7 +5060,7 @@ ethtool_tsinfo_get_dump(ynl_cpp::ynl_socket&  ys,
 
 /* ============== ETHTOOL_MSG_CABLE_TEST_ACT ============== */
 /* ETHTOOL_MSG_CABLE_TEST_ACT - do */
-int ethtool_cable_test_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_cable_test_act(ynl_cpp::ynl_socket& ys,
 			   ethtool_cable_test_act_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -5082,7 +5082,7 @@ int ethtool_cable_test_act(ynl_cpp::ynl_socket&  ys,
 
 /* ============== ETHTOOL_MSG_CABLE_TEST_TDR_ACT ============== */
 /* ETHTOOL_MSG_CABLE_TEST_TDR_ACT - do */
-int ethtool_cable_test_tdr_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_cable_test_tdr_act(ynl_cpp::ynl_socket& ys,
 			       ethtool_cable_test_tdr_act_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -5140,7 +5140,7 @@ int ethtool_tunnel_info_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_tunnel_info_get_rsp>
-ethtool_tunnel_info_get(ynl_cpp::ynl_socket&  ys,
+ethtool_tunnel_info_get(ynl_cpp::ynl_socket& ys,
 			ethtool_tunnel_info_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -5169,7 +5169,7 @@ ethtool_tunnel_info_get(ynl_cpp::ynl_socket&  ys,
 
 /* ETHTOOL_MSG_TUNNEL_INFO_GET - dump */
 std::unique_ptr<ethtool_tunnel_info_get_list>
-ethtool_tunnel_info_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tunnel_info_get_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_tunnel_info_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5251,7 +5251,7 @@ int ethtool_fec_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_fec_get_rsp>
-ethtool_fec_get(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req& req)
+ethtool_fec_get(ynl_cpp::ynl_socket& ys, ethtool_fec_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_fec_get_rsp> rsp;
@@ -5279,7 +5279,7 @@ ethtool_fec_get(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req& req)
 
 /* ETHTOOL_MSG_FEC_GET - dump */
 std::unique_ptr<ethtool_fec_get_list>
-ethtool_fec_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req_dump& req)
+ethtool_fec_get_dump(ynl_cpp::ynl_socket& ys, ethtool_fec_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -5309,7 +5309,7 @@ ethtool_fec_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req_dump& req)
 /* ETHTOOL_MSG_FEC_GET - notify */
 /* ============== ETHTOOL_MSG_FEC_SET ============== */
 /* ETHTOOL_MSG_FEC_SET - do */
-int ethtool_fec_set(ynl_cpp::ynl_socket&  ys, ethtool_fec_set_req& req)
+int ethtool_fec_set(ynl_cpp::ynl_socket& ys, ethtool_fec_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -5372,7 +5372,7 @@ int ethtool_module_eeprom_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_module_eeprom_get_rsp>
-ethtool_module_eeprom_get(ynl_cpp::ynl_socket&  ys,
+ethtool_module_eeprom_get(ynl_cpp::ynl_socket& ys,
 			  ethtool_module_eeprom_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -5411,7 +5411,7 @@ ethtool_module_eeprom_get(ynl_cpp::ynl_socket&  ys,
 
 /* ETHTOOL_MSG_MODULE_EEPROM_GET - dump */
 std::unique_ptr<ethtool_module_eeprom_get_list>
-ethtool_module_eeprom_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_module_eeprom_get_dump(ynl_cpp::ynl_socket& ys,
 			       ethtool_module_eeprom_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5499,7 +5499,7 @@ int ethtool_stats_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_stats_get_rsp>
-ethtool_stats_get(ynl_cpp::ynl_socket&  ys, ethtool_stats_get_req& req)
+ethtool_stats_get(ynl_cpp::ynl_socket& ys, ethtool_stats_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_stats_get_rsp> rsp;
@@ -5529,7 +5529,7 @@ ethtool_stats_get(ynl_cpp::ynl_socket&  ys, ethtool_stats_get_req& req)
 
 /* ETHTOOL_MSG_STATS_GET - dump */
 std::unique_ptr<ethtool_stats_get_list>
-ethtool_stats_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_stats_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_stats_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5593,7 +5593,7 @@ int ethtool_phc_vclocks_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_phc_vclocks_get_rsp>
-ethtool_phc_vclocks_get(ynl_cpp::ynl_socket&  ys,
+ethtool_phc_vclocks_get(ynl_cpp::ynl_socket& ys,
 			ethtool_phc_vclocks_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -5622,7 +5622,7 @@ ethtool_phc_vclocks_get(ynl_cpp::ynl_socket&  ys,
 
 /* ETHTOOL_MSG_PHC_VCLOCKS_GET - dump */
 std::unique_ptr<ethtool_phc_vclocks_get_list>
-ethtool_phc_vclocks_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_phc_vclocks_get_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_phc_vclocks_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5688,7 +5688,7 @@ int ethtool_module_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_module_get_rsp>
-ethtool_module_get(ynl_cpp::ynl_socket&  ys, ethtool_module_get_req& req)
+ethtool_module_get(ynl_cpp::ynl_socket& ys, ethtool_module_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_module_get_rsp> rsp;
@@ -5716,7 +5716,7 @@ ethtool_module_get(ynl_cpp::ynl_socket&  ys, ethtool_module_get_req& req)
 
 /* ETHTOOL_MSG_MODULE_GET - dump */
 std::unique_ptr<ethtool_module_get_list>
-ethtool_module_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_module_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_module_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -5747,7 +5747,7 @@ ethtool_module_get_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_MODULE_GET - notify */
 /* ============== ETHTOOL_MSG_MODULE_SET ============== */
 /* ETHTOOL_MSG_MODULE_SET - do */
-int ethtool_module_set(ynl_cpp::ynl_socket&  ys, ethtool_module_set_req& req)
+int ethtool_module_set(ynl_cpp::ynl_socket& ys, ethtool_module_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -5877,7 +5877,7 @@ int ethtool_pse_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_pse_get_rsp>
-ethtool_pse_get(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req& req)
+ethtool_pse_get(ynl_cpp::ynl_socket& ys, ethtool_pse_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_pse_get_rsp> rsp;
@@ -5905,7 +5905,7 @@ ethtool_pse_get(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req& req)
 
 /* ETHTOOL_MSG_PSE_GET - dump */
 std::unique_ptr<ethtool_pse_get_list>
-ethtool_pse_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req_dump& req)
+ethtool_pse_get_dump(ynl_cpp::ynl_socket& ys, ethtool_pse_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -5934,7 +5934,7 @@ ethtool_pse_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req_dump& req)
 
 /* ============== ETHTOOL_MSG_PSE_SET ============== */
 /* ETHTOOL_MSG_PSE_SET - do */
-int ethtool_pse_set(ynl_cpp::ynl_socket&  ys, ethtool_pse_set_req& req)
+int ethtool_pse_set(ynl_cpp::ynl_socket& ys, ethtool_pse_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -6023,7 +6023,7 @@ int ethtool_rss_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_rss_get_rsp>
-ethtool_rss_get(ynl_cpp::ynl_socket&  ys, ethtool_rss_get_req& req)
+ethtool_rss_get(ynl_cpp::ynl_socket& ys, ethtool_rss_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_rss_get_rsp> rsp;
@@ -6053,7 +6053,7 @@ ethtool_rss_get(ynl_cpp::ynl_socket&  ys, ethtool_rss_get_req& req)
 
 /* ETHTOOL_MSG_RSS_GET - dump */
 std::unique_ptr<ethtool_rss_get_list>
-ethtool_rss_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_rss_get_req_dump& req)
+ethtool_rss_get_dump(ynl_cpp::ynl_socket& ys, ethtool_rss_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -6145,7 +6145,7 @@ int ethtool_plca_get_cfg_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_plca_get_cfg_rsp>
-ethtool_plca_get_cfg(ynl_cpp::ynl_socket&  ys, ethtool_plca_get_cfg_req& req)
+ethtool_plca_get_cfg(ynl_cpp::ynl_socket& ys, ethtool_plca_get_cfg_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_plca_get_cfg_rsp> rsp;
@@ -6173,7 +6173,7 @@ ethtool_plca_get_cfg(ynl_cpp::ynl_socket&  ys, ethtool_plca_get_cfg_req& req)
 
 /* ETHTOOL_MSG_PLCA_GET_CFG - dump */
 std::unique_ptr<ethtool_plca_get_cfg_list>
-ethtool_plca_get_cfg_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_cfg_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_plca_get_cfg_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -6204,7 +6204,7 @@ ethtool_plca_get_cfg_dump(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_PLCA_GET_CFG - notify */
 /* ============== ETHTOOL_MSG_PLCA_SET_CFG ============== */
 /* ETHTOOL_MSG_PLCA_SET_CFG - do */
-int ethtool_plca_set_cfg(ynl_cpp::ynl_socket&  ys,
+int ethtool_plca_set_cfg(ynl_cpp::ynl_socket& ys,
 			 ethtool_plca_set_cfg_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -6302,7 +6302,7 @@ int ethtool_plca_get_status_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_plca_get_status_rsp>
-ethtool_plca_get_status(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_status(ynl_cpp::ynl_socket& ys,
 			ethtool_plca_get_status_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -6331,7 +6331,7 @@ ethtool_plca_get_status(ynl_cpp::ynl_socket&  ys,
 
 /* ETHTOOL_MSG_PLCA_GET_STATUS - dump */
 std::unique_ptr<ethtool_plca_get_status_list>
-ethtool_plca_get_status_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_status_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_plca_get_status_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -6429,7 +6429,7 @@ int ethtool_mm_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_mm_get_rsp>
-ethtool_mm_get(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req& req)
+ethtool_mm_get(ynl_cpp::ynl_socket& ys, ethtool_mm_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_mm_get_rsp> rsp;
@@ -6457,7 +6457,7 @@ ethtool_mm_get(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req& req)
 
 /* ETHTOOL_MSG_MM_GET - dump */
 std::unique_ptr<ethtool_mm_get_list>
-ethtool_mm_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req_dump& req)
+ethtool_mm_get_dump(ynl_cpp::ynl_socket& ys, ethtool_mm_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -6487,7 +6487,7 @@ ethtool_mm_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req_dump& req)
 /* ETHTOOL_MSG_MM_GET - notify */
 /* ============== ETHTOOL_MSG_MM_SET ============== */
 /* ETHTOOL_MSG_MM_SET - do */
-int ethtool_mm_set(ynl_cpp::ynl_socket&  ys, ethtool_mm_set_req& req)
+int ethtool_mm_set(ynl_cpp::ynl_socket& ys, ethtool_mm_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -6518,7 +6518,7 @@ int ethtool_mm_set(ynl_cpp::ynl_socket&  ys, ethtool_mm_set_req& req)
 
 /* ============== ETHTOOL_MSG_MODULE_FW_FLASH_ACT ============== */
 /* ETHTOOL_MSG_MODULE_FW_FLASH_ACT - do */
-int ethtool_module_fw_flash_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_module_fw_flash_act(ynl_cpp::ynl_socket& ys,
 				ethtool_module_fw_flash_act_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -6600,7 +6600,7 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_phy_get_rsp>
-ethtool_phy_get(ynl_cpp::ynl_socket&  ys, ethtool_phy_get_req& req)
+ethtool_phy_get(ynl_cpp::ynl_socket& ys, ethtool_phy_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_phy_get_rsp> rsp;
@@ -6628,7 +6628,7 @@ ethtool_phy_get(ynl_cpp::ynl_socket&  ys, ethtool_phy_get_req& req)
 
 /* ETHTOOL_MSG_PHY_GET - dump */
 std::unique_ptr<ethtool_phy_get_list>
-ethtool_phy_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_phy_get_req_dump& req)
+ethtool_phy_get_dump(ynl_cpp::ynl_socket& ys, ethtool_phy_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -6718,7 +6718,7 @@ int ethtool_tsconfig_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_tsconfig_get_rsp>
-ethtool_tsconfig_get(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_get_req& req)
+ethtool_tsconfig_get(ynl_cpp::ynl_socket& ys, ethtool_tsconfig_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_tsconfig_get_rsp> rsp;
@@ -6746,7 +6746,7 @@ ethtool_tsconfig_get(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_get_req& req)
 
 /* ETHTOOL_MSG_TSCONFIG_GET - dump */
 std::unique_ptr<ethtool_tsconfig_get_list>
-ethtool_tsconfig_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tsconfig_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_tsconfig_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -6836,7 +6836,7 @@ int ethtool_tsconfig_set_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_tsconfig_set_rsp>
-ethtool_tsconfig_set(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_set_req& req)
+ethtool_tsconfig_set(ynl_cpp::ynl_socket& ys, ethtool_tsconfig_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ethtool_tsconfig_set_rsp> rsp;
@@ -6872,7 +6872,7 @@ ethtool_tsconfig_set(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_set_req& req)
 
 /* ============== ETHTOOL_MSG_RSS_SET ============== */
 /* ETHTOOL_MSG_RSS_SET - do */
-int ethtool_rss_set(ynl_cpp::ynl_socket&  ys, ethtool_rss_set_req& req)
+int ethtool_rss_set(ynl_cpp::ynl_socket& ys, ethtool_rss_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -6957,7 +6957,7 @@ int ethtool_rss_create_act_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ethtool_rss_create_act_rsp>
-ethtool_rss_create_act(ynl_cpp::ynl_socket&  ys,
+ethtool_rss_create_act(ynl_cpp::ynl_socket& ys,
 		       ethtool_rss_create_act_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -6997,7 +6997,7 @@ ethtool_rss_create_act(ynl_cpp::ynl_socket&  ys,
 /* ETHTOOL_MSG_RSS_CREATE_ACT - notify */
 /* ============== ETHTOOL_MSG_RSS_DELETE_ACT ============== */
 /* ETHTOOL_MSG_RSS_DELETE_ACT - do */
-int ethtool_rss_delete_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_rss_delete_act(ynl_cpp::ynl_socket& ys,
 			   ethtool_rss_delete_act_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
diff --git a/generated/ethtool-user.hpp b/generated/ethtool-user.hpp
index 88b241c..547676b 100644
--- a/generated/ethtool-user.hpp
+++ b/generated/ethtool-user.hpp
@@ -236,7 +236,7 @@ struct ethtool_strset_get_rsp {
  * Get string set from the kernel.
  */
 std::unique_ptr<ethtool_strset_get_rsp>
-ethtool_strset_get(ynl_cpp::ynl_socket&  ys, ethtool_strset_get_req& req);
+ethtool_strset_get(ynl_cpp::ynl_socket& ys, ethtool_strset_get_req& req);
 
 /* ETHTOOL_MSG_STRSET_GET - dump */
 struct ethtool_strset_get_req_dump {
@@ -250,7 +250,7 @@ struct ethtool_strset_get_list {
 };
 
 std::unique_ptr<ethtool_strset_get_list>
-ethtool_strset_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_strset_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_strset_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_LINKINFO_GET ============== */
@@ -272,7 +272,7 @@ struct ethtool_linkinfo_get_rsp {
  * Get link info.
  */
 std::unique_ptr<ethtool_linkinfo_get_rsp>
-ethtool_linkinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_linkinfo_get_req& req);
+ethtool_linkinfo_get(ynl_cpp::ynl_socket& ys, ethtool_linkinfo_get_req& req);
 
 /* ETHTOOL_MSG_LINKINFO_GET - dump */
 struct ethtool_linkinfo_get_req_dump {
@@ -284,7 +284,7 @@ struct ethtool_linkinfo_get_list {
 };
 
 std::unique_ptr<ethtool_linkinfo_get_list>
-ethtool_linkinfo_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkinfo_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_linkinfo_get_req_dump& req);
 
 /* ETHTOOL_MSG_LINKINFO_GET - notify */
@@ -305,7 +305,7 @@ struct ethtool_linkinfo_set_req {
 /*
  * Set link info.
  */
-int ethtool_linkinfo_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_linkinfo_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_linkinfo_set_req& req);
 
 /* ============== ETHTOOL_MSG_LINKMODES_GET ============== */
@@ -331,7 +331,7 @@ struct ethtool_linkmodes_get_rsp {
  * Get link modes.
  */
 std::unique_ptr<ethtool_linkmodes_get_rsp>
-ethtool_linkmodes_get(ynl_cpp::ynl_socket&  ys, ethtool_linkmodes_get_req& req);
+ethtool_linkmodes_get(ynl_cpp::ynl_socket& ys, ethtool_linkmodes_get_req& req);
 
 /* ETHTOOL_MSG_LINKMODES_GET - dump */
 struct ethtool_linkmodes_get_req_dump {
@@ -343,7 +343,7 @@ struct ethtool_linkmodes_get_list {
 };
 
 std::unique_ptr<ethtool_linkmodes_get_list>
-ethtool_linkmodes_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkmodes_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_linkmodes_get_req_dump& req);
 
 /* ETHTOOL_MSG_LINKMODES_GET - notify */
@@ -368,7 +368,7 @@ struct ethtool_linkmodes_set_req {
 /*
  * Set link modes.
  */
-int ethtool_linkmodes_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_linkmodes_set(ynl_cpp::ynl_socket& ys,
 			  ethtool_linkmodes_set_req& req);
 
 /* ============== ETHTOOL_MSG_LINKSTATE_GET ============== */
@@ -391,7 +391,7 @@ struct ethtool_linkstate_get_rsp {
  * Get link state.
  */
 std::unique_ptr<ethtool_linkstate_get_rsp>
-ethtool_linkstate_get(ynl_cpp::ynl_socket&  ys, ethtool_linkstate_get_req& req);
+ethtool_linkstate_get(ynl_cpp::ynl_socket& ys, ethtool_linkstate_get_req& req);
 
 /* ETHTOOL_MSG_LINKSTATE_GET - dump */
 struct ethtool_linkstate_get_req_dump {
@@ -403,7 +403,7 @@ struct ethtool_linkstate_get_list {
 };
 
 std::unique_ptr<ethtool_linkstate_get_list>
-ethtool_linkstate_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_linkstate_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_linkstate_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_DEBUG_GET ============== */
@@ -421,7 +421,7 @@ struct ethtool_debug_get_rsp {
  * Get debug message mask.
  */
 std::unique_ptr<ethtool_debug_get_rsp>
-ethtool_debug_get(ynl_cpp::ynl_socket&  ys, ethtool_debug_get_req& req);
+ethtool_debug_get(ynl_cpp::ynl_socket& ys, ethtool_debug_get_req& req);
 
 /* ETHTOOL_MSG_DEBUG_GET - dump */
 struct ethtool_debug_get_req_dump {
@@ -433,7 +433,7 @@ struct ethtool_debug_get_list {
 };
 
 std::unique_ptr<ethtool_debug_get_list>
-ethtool_debug_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_debug_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_debug_get_req_dump& req);
 
 /* ETHTOOL_MSG_DEBUG_GET - notify */
@@ -450,7 +450,7 @@ struct ethtool_debug_set_req {
 /*
  * Set debug message mask.
  */
-int ethtool_debug_set(ynl_cpp::ynl_socket&  ys, ethtool_debug_set_req& req);
+int ethtool_debug_set(ynl_cpp::ynl_socket& ys, ethtool_debug_set_req& req);
 
 /* ============== ETHTOOL_MSG_WOL_GET ============== */
 /* ETHTOOL_MSG_WOL_GET - do */
@@ -468,7 +468,7 @@ struct ethtool_wol_get_rsp {
  * Get WOL params.
  */
 std::unique_ptr<ethtool_wol_get_rsp>
-ethtool_wol_get(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req& req);
+ethtool_wol_get(ynl_cpp::ynl_socket& ys, ethtool_wol_get_req& req);
 
 /* ETHTOOL_MSG_WOL_GET - dump */
 struct ethtool_wol_get_req_dump {
@@ -480,7 +480,7 @@ struct ethtool_wol_get_list {
 };
 
 std::unique_ptr<ethtool_wol_get_list>
-ethtool_wol_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_wol_get_req_dump& req);
+ethtool_wol_get_dump(ynl_cpp::ynl_socket& ys, ethtool_wol_get_req_dump& req);
 
 /* ETHTOOL_MSG_WOL_GET - notify */
 struct ethtool_wol_get_ntf {
@@ -497,7 +497,7 @@ struct ethtool_wol_set_req {
 /*
  * Set WOL params.
  */
-int ethtool_wol_set(ynl_cpp::ynl_socket&  ys, ethtool_wol_set_req& req);
+int ethtool_wol_set(ynl_cpp::ynl_socket& ys, ethtool_wol_set_req& req);
 
 /* ============== ETHTOOL_MSG_FEATURES_GET ============== */
 /* ETHTOOL_MSG_FEATURES_GET - do */
@@ -517,7 +517,7 @@ struct ethtool_features_get_rsp {
  * Get features.
  */
 std::unique_ptr<ethtool_features_get_rsp>
-ethtool_features_get(ynl_cpp::ynl_socket&  ys, ethtool_features_get_req& req);
+ethtool_features_get(ynl_cpp::ynl_socket& ys, ethtool_features_get_req& req);
 
 /* ETHTOOL_MSG_FEATURES_GET - dump */
 struct ethtool_features_get_req_dump {
@@ -529,7 +529,7 @@ struct ethtool_features_get_list {
 };
 
 std::unique_ptr<ethtool_features_get_list>
-ethtool_features_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_features_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_features_get_req_dump& req);
 
 /* ETHTOOL_MSG_FEATURES_GET - notify */
@@ -558,7 +558,7 @@ struct ethtool_features_set_rsp {
  * Set features.
  */
 std::unique_ptr<ethtool_features_set_rsp>
-ethtool_features_set(ynl_cpp::ynl_socket&  ys, ethtool_features_set_req& req);
+ethtool_features_set(ynl_cpp::ynl_socket& ys, ethtool_features_set_req& req);
 
 /* ============== ETHTOOL_MSG_PRIVFLAGS_GET ============== */
 /* ETHTOOL_MSG_PRIVFLAGS_GET - do */
@@ -575,7 +575,7 @@ struct ethtool_privflags_get_rsp {
  * Get device private flags.
  */
 std::unique_ptr<ethtool_privflags_get_rsp>
-ethtool_privflags_get(ynl_cpp::ynl_socket&  ys, ethtool_privflags_get_req& req);
+ethtool_privflags_get(ynl_cpp::ynl_socket& ys, ethtool_privflags_get_req& req);
 
 /* ETHTOOL_MSG_PRIVFLAGS_GET - dump */
 struct ethtool_privflags_get_req_dump {
@@ -587,7 +587,7 @@ struct ethtool_privflags_get_list {
 };
 
 std::unique_ptr<ethtool_privflags_get_list>
-ethtool_privflags_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_privflags_get_dump(ynl_cpp::ynl_socket& ys,
 			   ethtool_privflags_get_req_dump& req);
 
 /* ETHTOOL_MSG_PRIVFLAGS_GET - notify */
@@ -604,7 +604,7 @@ struct ethtool_privflags_set_req {
 /*
  * Set device private flags.
  */
-int ethtool_privflags_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_privflags_set(ynl_cpp::ynl_socket& ys,
 			  ethtool_privflags_set_req& req);
 
 /* ============== ETHTOOL_MSG_RINGS_GET ============== */
@@ -638,7 +638,7 @@ struct ethtool_rings_get_rsp {
  * Get ring params.
  */
 std::unique_ptr<ethtool_rings_get_rsp>
-ethtool_rings_get(ynl_cpp::ynl_socket&  ys, ethtool_rings_get_req& req);
+ethtool_rings_get(ynl_cpp::ynl_socket& ys, ethtool_rings_get_req& req);
 
 /* ETHTOOL_MSG_RINGS_GET - dump */
 struct ethtool_rings_get_req_dump {
@@ -650,7 +650,7 @@ struct ethtool_rings_get_list {
 };
 
 std::unique_ptr<ethtool_rings_get_list>
-ethtool_rings_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_rings_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_rings_get_req_dump& req);
 
 /* ETHTOOL_MSG_RINGS_GET - notify */
@@ -683,7 +683,7 @@ struct ethtool_rings_set_req {
 /*
  * Set ring params.
  */
-int ethtool_rings_set(ynl_cpp::ynl_socket&  ys, ethtool_rings_set_req& req);
+int ethtool_rings_set(ynl_cpp::ynl_socket& ys, ethtool_rings_set_req& req);
 
 /* ============== ETHTOOL_MSG_CHANNELS_GET ============== */
 /* ETHTOOL_MSG_CHANNELS_GET - do */
@@ -707,7 +707,7 @@ struct ethtool_channels_get_rsp {
  * Get channel params.
  */
 std::unique_ptr<ethtool_channels_get_rsp>
-ethtool_channels_get(ynl_cpp::ynl_socket&  ys, ethtool_channels_get_req& req);
+ethtool_channels_get(ynl_cpp::ynl_socket& ys, ethtool_channels_get_req& req);
 
 /* ETHTOOL_MSG_CHANNELS_GET - dump */
 struct ethtool_channels_get_req_dump {
@@ -719,7 +719,7 @@ struct ethtool_channels_get_list {
 };
 
 std::unique_ptr<ethtool_channels_get_list>
-ethtool_channels_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_channels_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_channels_get_req_dump& req);
 
 /* ETHTOOL_MSG_CHANNELS_GET - notify */
@@ -743,7 +743,7 @@ struct ethtool_channels_set_req {
 /*
  * Set channel params.
  */
-int ethtool_channels_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_channels_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_channels_set_req& req);
 
 /* ============== ETHTOOL_MSG_COALESCE_GET ============== */
@@ -789,7 +789,7 @@ struct ethtool_coalesce_get_rsp {
  * Get coalesce params.
  */
 std::unique_ptr<ethtool_coalesce_get_rsp>
-ethtool_coalesce_get(ynl_cpp::ynl_socket&  ys, ethtool_coalesce_get_req& req);
+ethtool_coalesce_get(ynl_cpp::ynl_socket& ys, ethtool_coalesce_get_req& req);
 
 /* ETHTOOL_MSG_COALESCE_GET - dump */
 struct ethtool_coalesce_get_req_dump {
@@ -801,7 +801,7 @@ struct ethtool_coalesce_get_list {
 };
 
 std::unique_ptr<ethtool_coalesce_get_list>
-ethtool_coalesce_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_coalesce_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_coalesce_get_req_dump& req);
 
 /* ETHTOOL_MSG_COALESCE_GET - notify */
@@ -846,7 +846,7 @@ struct ethtool_coalesce_set_req {
 /*
  * Set coalesce params.
  */
-int ethtool_coalesce_set(ynl_cpp::ynl_socket&  ys,
+int ethtool_coalesce_set(ynl_cpp::ynl_socket& ys,
 			 ethtool_coalesce_set_req& req);
 
 /* ============== ETHTOOL_MSG_PAUSE_GET ============== */
@@ -868,7 +868,7 @@ struct ethtool_pause_get_rsp {
  * Get pause params.
  */
 std::unique_ptr<ethtool_pause_get_rsp>
-ethtool_pause_get(ynl_cpp::ynl_socket&  ys, ethtool_pause_get_req& req);
+ethtool_pause_get(ynl_cpp::ynl_socket& ys, ethtool_pause_get_req& req);
 
 /* ETHTOOL_MSG_PAUSE_GET - dump */
 struct ethtool_pause_get_req_dump {
@@ -880,7 +880,7 @@ struct ethtool_pause_get_list {
 };
 
 std::unique_ptr<ethtool_pause_get_list>
-ethtool_pause_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_pause_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_pause_get_req_dump& req);
 
 /* ETHTOOL_MSG_PAUSE_GET - notify */
@@ -901,7 +901,7 @@ struct ethtool_pause_set_req {
 /*
  * Set pause params.
  */
-int ethtool_pause_set(ynl_cpp::ynl_socket&  ys, ethtool_pause_set_req& req);
+int ethtool_pause_set(ynl_cpp::ynl_socket& ys, ethtool_pause_set_req& req);
 
 /* ============== ETHTOOL_MSG_EEE_GET ============== */
 /* ETHTOOL_MSG_EEE_GET - do */
@@ -923,7 +923,7 @@ struct ethtool_eee_get_rsp {
  * Get eee params.
  */
 std::unique_ptr<ethtool_eee_get_rsp>
-ethtool_eee_get(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req& req);
+ethtool_eee_get(ynl_cpp::ynl_socket& ys, ethtool_eee_get_req& req);
 
 /* ETHTOOL_MSG_EEE_GET - dump */
 struct ethtool_eee_get_req_dump {
@@ -935,7 +935,7 @@ struct ethtool_eee_get_list {
 };
 
 std::unique_ptr<ethtool_eee_get_list>
-ethtool_eee_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_eee_get_req_dump& req);
+ethtool_eee_get_dump(ynl_cpp::ynl_socket& ys, ethtool_eee_get_req_dump& req);
 
 /* ETHTOOL_MSG_EEE_GET - notify */
 struct ethtool_eee_get_ntf {
@@ -956,7 +956,7 @@ struct ethtool_eee_set_req {
 /*
  * Set eee params.
  */
-int ethtool_eee_set(ynl_cpp::ynl_socket&  ys, ethtool_eee_set_req& req);
+int ethtool_eee_set(ynl_cpp::ynl_socket& ys, ethtool_eee_set_req& req);
 
 /* ============== ETHTOOL_MSG_TSINFO_GET ============== */
 /* ETHTOOL_MSG_TSINFO_GET - do */
@@ -981,7 +981,7 @@ struct ethtool_tsinfo_get_rsp {
  * Get tsinfo params.
  */
 std::unique_ptr<ethtool_tsinfo_get_rsp>
-ethtool_tsinfo_get(ynl_cpp::ynl_socket&  ys, ethtool_tsinfo_get_req& req);
+ethtool_tsinfo_get(ynl_cpp::ynl_socket& ys, ethtool_tsinfo_get_req& req);
 
 /* ETHTOOL_MSG_TSINFO_GET - dump */
 struct ethtool_tsinfo_get_req_dump {
@@ -994,7 +994,7 @@ struct ethtool_tsinfo_get_list {
 };
 
 std::unique_ptr<ethtool_tsinfo_get_list>
-ethtool_tsinfo_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tsinfo_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_tsinfo_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_CABLE_TEST_ACT ============== */
@@ -1006,7 +1006,7 @@ struct ethtool_cable_test_act_req {
 /*
  * Cable test.
  */
-int ethtool_cable_test_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_cable_test_act(ynl_cpp::ynl_socket& ys,
 			   ethtool_cable_test_act_req& req);
 
 /* ============== ETHTOOL_MSG_CABLE_TEST_TDR_ACT ============== */
@@ -1018,7 +1018,7 @@ struct ethtool_cable_test_tdr_act_req {
 /*
  * Cable test TDR.
  */
-int ethtool_cable_test_tdr_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_cable_test_tdr_act(ynl_cpp::ynl_socket& ys,
 			       ethtool_cable_test_tdr_act_req& req);
 
 /* ============== ETHTOOL_MSG_TUNNEL_INFO_GET ============== */
@@ -1036,7 +1036,7 @@ struct ethtool_tunnel_info_get_rsp {
  * Get tsinfo params.
  */
 std::unique_ptr<ethtool_tunnel_info_get_rsp>
-ethtool_tunnel_info_get(ynl_cpp::ynl_socket&  ys,
+ethtool_tunnel_info_get(ynl_cpp::ynl_socket& ys,
 			ethtool_tunnel_info_get_req& req);
 
 /* ETHTOOL_MSG_TUNNEL_INFO_GET - dump */
@@ -1049,7 +1049,7 @@ struct ethtool_tunnel_info_get_list {
 };
 
 std::unique_ptr<ethtool_tunnel_info_get_list>
-ethtool_tunnel_info_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tunnel_info_get_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_tunnel_info_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_FEC_GET ============== */
@@ -1070,7 +1070,7 @@ struct ethtool_fec_get_rsp {
  * Get FEC params.
  */
 std::unique_ptr<ethtool_fec_get_rsp>
-ethtool_fec_get(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req& req);
+ethtool_fec_get(ynl_cpp::ynl_socket& ys, ethtool_fec_get_req& req);
 
 /* ETHTOOL_MSG_FEC_GET - dump */
 struct ethtool_fec_get_req_dump {
@@ -1082,7 +1082,7 @@ struct ethtool_fec_get_list {
 };
 
 std::unique_ptr<ethtool_fec_get_list>
-ethtool_fec_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_fec_get_req_dump& req);
+ethtool_fec_get_dump(ynl_cpp::ynl_socket& ys, ethtool_fec_get_req_dump& req);
 
 /* ETHTOOL_MSG_FEC_GET - notify */
 struct ethtool_fec_get_ntf {
@@ -1101,7 +1101,7 @@ struct ethtool_fec_set_req {
 /*
  * Set FEC params.
  */
-int ethtool_fec_set(ynl_cpp::ynl_socket&  ys, ethtool_fec_set_req& req);
+int ethtool_fec_set(ynl_cpp::ynl_socket& ys, ethtool_fec_set_req& req);
 
 /* ============== ETHTOOL_MSG_MODULE_EEPROM_GET ============== */
 /* ETHTOOL_MSG_MODULE_EEPROM_GET - do */
@@ -1123,7 +1123,7 @@ struct ethtool_module_eeprom_get_rsp {
  * Get module EEPROM params.
  */
 std::unique_ptr<ethtool_module_eeprom_get_rsp>
-ethtool_module_eeprom_get(ynl_cpp::ynl_socket&  ys,
+ethtool_module_eeprom_get(ynl_cpp::ynl_socket& ys,
 			  ethtool_module_eeprom_get_req& req);
 
 /* ETHTOOL_MSG_MODULE_EEPROM_GET - dump */
@@ -1141,7 +1141,7 @@ struct ethtool_module_eeprom_get_list {
 };
 
 std::unique_ptr<ethtool_module_eeprom_get_list>
-ethtool_module_eeprom_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_module_eeprom_get_dump(ynl_cpp::ynl_socket& ys,
 			       ethtool_module_eeprom_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_STATS_GET ============== */
@@ -1162,7 +1162,7 @@ struct ethtool_stats_get_rsp {
  * Get statistics.
  */
 std::unique_ptr<ethtool_stats_get_rsp>
-ethtool_stats_get(ynl_cpp::ynl_socket&  ys, ethtool_stats_get_req& req);
+ethtool_stats_get(ynl_cpp::ynl_socket& ys, ethtool_stats_get_req& req);
 
 /* ETHTOOL_MSG_STATS_GET - dump */
 struct ethtool_stats_get_req_dump {
@@ -1175,7 +1175,7 @@ struct ethtool_stats_get_list {
 };
 
 std::unique_ptr<ethtool_stats_get_list>
-ethtool_stats_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_stats_get_dump(ynl_cpp::ynl_socket& ys,
 		       ethtool_stats_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_PHC_VCLOCKS_GET ============== */
@@ -1193,7 +1193,7 @@ struct ethtool_phc_vclocks_get_rsp {
  * Get PHC VCLOCKs.
  */
 std::unique_ptr<ethtool_phc_vclocks_get_rsp>
-ethtool_phc_vclocks_get(ynl_cpp::ynl_socket&  ys,
+ethtool_phc_vclocks_get(ynl_cpp::ynl_socket& ys,
 			ethtool_phc_vclocks_get_req& req);
 
 /* ETHTOOL_MSG_PHC_VCLOCKS_GET - dump */
@@ -1206,7 +1206,7 @@ struct ethtool_phc_vclocks_get_list {
 };
 
 std::unique_ptr<ethtool_phc_vclocks_get_list>
-ethtool_phc_vclocks_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_phc_vclocks_get_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_phc_vclocks_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_MODULE_GET ============== */
@@ -1225,7 +1225,7 @@ struct ethtool_module_get_rsp {
  * Get module params.
  */
 std::unique_ptr<ethtool_module_get_rsp>
-ethtool_module_get(ynl_cpp::ynl_socket&  ys, ethtool_module_get_req& req);
+ethtool_module_get(ynl_cpp::ynl_socket& ys, ethtool_module_get_req& req);
 
 /* ETHTOOL_MSG_MODULE_GET - dump */
 struct ethtool_module_get_req_dump {
@@ -1237,7 +1237,7 @@ struct ethtool_module_get_list {
 };
 
 std::unique_ptr<ethtool_module_get_list>
-ethtool_module_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_module_get_dump(ynl_cpp::ynl_socket& ys,
 			ethtool_module_get_req_dump& req);
 
 /* ETHTOOL_MSG_MODULE_GET - notify */
@@ -1255,7 +1255,7 @@ struct ethtool_module_set_req {
 /*
  * Set module params.
  */
-int ethtool_module_set(ynl_cpp::ynl_socket&  ys, ethtool_module_set_req& req);
+int ethtool_module_set(ynl_cpp::ynl_socket& ys, ethtool_module_set_req& req);
 
 /* ============== ETHTOOL_MSG_PSE_GET ============== */
 /* ETHTOOL_MSG_PSE_GET - do */
@@ -1286,7 +1286,7 @@ struct ethtool_pse_get_rsp {
  * Get Power Sourcing Equipment params.
  */
 std::unique_ptr<ethtool_pse_get_rsp>
-ethtool_pse_get(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req& req);
+ethtool_pse_get(ynl_cpp::ynl_socket& ys, ethtool_pse_get_req& req);
 
 /* ETHTOOL_MSG_PSE_GET - dump */
 struct ethtool_pse_get_req_dump {
@@ -1298,7 +1298,7 @@ struct ethtool_pse_get_list {
 };
 
 std::unique_ptr<ethtool_pse_get_list>
-ethtool_pse_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_pse_get_req_dump& req);
+ethtool_pse_get_dump(ynl_cpp::ynl_socket& ys, ethtool_pse_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_PSE_SET ============== */
 /* ETHTOOL_MSG_PSE_SET - do */
@@ -1313,7 +1313,7 @@ struct ethtool_pse_set_req {
 /*
  * Set Power Sourcing Equipment params.
  */
-int ethtool_pse_set(ynl_cpp::ynl_socket&  ys, ethtool_pse_set_req& req);
+int ethtool_pse_set(ynl_cpp::ynl_socket& ys, ethtool_pse_set_req& req);
 
 /* ============== ETHTOOL_MSG_RSS_GET ============== */
 /* ETHTOOL_MSG_RSS_GET - do */
@@ -1336,7 +1336,7 @@ struct ethtool_rss_get_rsp {
  * Get RSS params.
  */
 std::unique_ptr<ethtool_rss_get_rsp>
-ethtool_rss_get(ynl_cpp::ynl_socket&  ys, ethtool_rss_get_req& req);
+ethtool_rss_get(ynl_cpp::ynl_socket& ys, ethtool_rss_get_req& req);
 
 /* ETHTOOL_MSG_RSS_GET - dump */
 struct ethtool_rss_get_req_dump {
@@ -1349,7 +1349,7 @@ struct ethtool_rss_get_list {
 };
 
 std::unique_ptr<ethtool_rss_get_list>
-ethtool_rss_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_rss_get_req_dump& req);
+ethtool_rss_get_dump(ynl_cpp::ynl_socket& ys, ethtool_rss_get_req_dump& req);
 
 /* ETHTOOL_MSG_RSS_GET - notify */
 struct ethtool_rss_get_ntf {
@@ -1377,7 +1377,7 @@ struct ethtool_plca_get_cfg_rsp {
  * Get PLCA params.
  */
 std::unique_ptr<ethtool_plca_get_cfg_rsp>
-ethtool_plca_get_cfg(ynl_cpp::ynl_socket&  ys, ethtool_plca_get_cfg_req& req);
+ethtool_plca_get_cfg(ynl_cpp::ynl_socket& ys, ethtool_plca_get_cfg_req& req);
 
 /* ETHTOOL_MSG_PLCA_GET_CFG - dump */
 struct ethtool_plca_get_cfg_req_dump {
@@ -1389,7 +1389,7 @@ struct ethtool_plca_get_cfg_list {
 };
 
 std::unique_ptr<ethtool_plca_get_cfg_list>
-ethtool_plca_get_cfg_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_cfg_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_plca_get_cfg_req_dump& req);
 
 /* ETHTOOL_MSG_PLCA_GET_CFG - notify */
@@ -1413,7 +1413,7 @@ struct ethtool_plca_set_cfg_req {
 /*
  * Set PLCA params.
  */
-int ethtool_plca_set_cfg(ynl_cpp::ynl_socket&  ys,
+int ethtool_plca_set_cfg(ynl_cpp::ynl_socket& ys,
 			 ethtool_plca_set_cfg_req& req);
 
 /* ============== ETHTOOL_MSG_PLCA_GET_STATUS ============== */
@@ -1438,7 +1438,7 @@ struct ethtool_plca_get_status_rsp {
  * Get PLCA status params.
  */
 std::unique_ptr<ethtool_plca_get_status_rsp>
-ethtool_plca_get_status(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_status(ynl_cpp::ynl_socket& ys,
 			ethtool_plca_get_status_req& req);
 
 /* ETHTOOL_MSG_PLCA_GET_STATUS - dump */
@@ -1451,7 +1451,7 @@ struct ethtool_plca_get_status_list {
 };
 
 std::unique_ptr<ethtool_plca_get_status_list>
-ethtool_plca_get_status_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_plca_get_status_dump(ynl_cpp::ynl_socket& ys,
 			     ethtool_plca_get_status_req_dump& req);
 
 /* ============== ETHTOOL_MSG_MM_GET ============== */
@@ -1477,7 +1477,7 @@ struct ethtool_mm_get_rsp {
  * Get MAC Merge configuration and state
  */
 std::unique_ptr<ethtool_mm_get_rsp>
-ethtool_mm_get(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req& req);
+ethtool_mm_get(ynl_cpp::ynl_socket& ys, ethtool_mm_get_req& req);
 
 /* ETHTOOL_MSG_MM_GET - dump */
 struct ethtool_mm_get_req_dump {
@@ -1489,7 +1489,7 @@ struct ethtool_mm_get_list {
 };
 
 std::unique_ptr<ethtool_mm_get_list>
-ethtool_mm_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_mm_get_req_dump& req);
+ethtool_mm_get_dump(ynl_cpp::ynl_socket& ys, ethtool_mm_get_req_dump& req);
 
 /* ETHTOOL_MSG_MM_GET - notify */
 struct ethtool_mm_get_ntf {
@@ -1509,7 +1509,7 @@ struct ethtool_mm_set_req {
 /*
  * Set MAC Merge configuration
  */
-int ethtool_mm_set(ynl_cpp::ynl_socket&  ys, ethtool_mm_set_req& req);
+int ethtool_mm_set(ynl_cpp::ynl_socket& ys, ethtool_mm_set_req& req);
 
 /* ============== ETHTOOL_MSG_MODULE_FW_FLASH_ACT ============== */
 /* ETHTOOL_MSG_MODULE_FW_FLASH_ACT - do */
@@ -1522,7 +1522,7 @@ struct ethtool_module_fw_flash_act_req {
 /*
  * Flash transceiver module firmware.
  */
-int ethtool_module_fw_flash_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_module_fw_flash_act(ynl_cpp::ynl_socket& ys,
 				ethtool_module_fw_flash_act_req& req);
 
 /* ============== ETHTOOL_MSG_PHY_GET ============== */
@@ -1546,7 +1546,7 @@ struct ethtool_phy_get_rsp {
  * Get PHY devices attached to an interface
  */
 std::unique_ptr<ethtool_phy_get_rsp>
-ethtool_phy_get(ynl_cpp::ynl_socket&  ys, ethtool_phy_get_req& req);
+ethtool_phy_get(ynl_cpp::ynl_socket& ys, ethtool_phy_get_req& req);
 
 /* ETHTOOL_MSG_PHY_GET - dump */
 struct ethtool_phy_get_req_dump {
@@ -1558,7 +1558,7 @@ struct ethtool_phy_get_list {
 };
 
 std::unique_ptr<ethtool_phy_get_list>
-ethtool_phy_get_dump(ynl_cpp::ynl_socket&  ys, ethtool_phy_get_req_dump& req);
+ethtool_phy_get_dump(ynl_cpp::ynl_socket& ys, ethtool_phy_get_req_dump& req);
 
 /* ETHTOOL_MSG_PHY_GET - notify */
 struct ethtool_phy_get_ntf {
@@ -1582,7 +1582,7 @@ struct ethtool_tsconfig_get_rsp {
  * Get hwtstamp config.
  */
 std::unique_ptr<ethtool_tsconfig_get_rsp>
-ethtool_tsconfig_get(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_get_req& req);
+ethtool_tsconfig_get(ynl_cpp::ynl_socket& ys, ethtool_tsconfig_get_req& req);
 
 /* ETHTOOL_MSG_TSCONFIG_GET - dump */
 struct ethtool_tsconfig_get_req_dump {
@@ -1594,7 +1594,7 @@ struct ethtool_tsconfig_get_list {
 };
 
 std::unique_ptr<ethtool_tsconfig_get_list>
-ethtool_tsconfig_get_dump(ynl_cpp::ynl_socket&  ys,
+ethtool_tsconfig_get_dump(ynl_cpp::ynl_socket& ys,
 			  ethtool_tsconfig_get_req_dump& req);
 
 /* ============== ETHTOOL_MSG_TSCONFIG_SET ============== */
@@ -1619,7 +1619,7 @@ struct ethtool_tsconfig_set_rsp {
  * Set hwtstamp config.
  */
 std::unique_ptr<ethtool_tsconfig_set_rsp>
-ethtool_tsconfig_set(ynl_cpp::ynl_socket&  ys, ethtool_tsconfig_set_req& req);
+ethtool_tsconfig_set(ynl_cpp::ynl_socket& ys, ethtool_tsconfig_set_req& req);
 
 /* ============== ETHTOOL_MSG_RSS_SET ============== */
 /* ETHTOOL_MSG_RSS_SET - do */
@@ -1636,7 +1636,7 @@ struct ethtool_rss_set_req {
 /*
  * Set RSS params.
  */
-int ethtool_rss_set(ynl_cpp::ynl_socket&  ys, ethtool_rss_set_req& req);
+int ethtool_rss_set(ynl_cpp::ynl_socket& ys, ethtool_rss_set_req& req);
 
 /* ============== ETHTOOL_MSG_RSS_CREATE_ACT ============== */
 /* ETHTOOL_MSG_RSS_CREATE_ACT - do */
@@ -1662,7 +1662,7 @@ struct ethtool_rss_create_act_rsp {
  * Create an RSS context.
  */
 std::unique_ptr<ethtool_rss_create_act_rsp>
-ethtool_rss_create_act(ynl_cpp::ynl_socket&  ys,
+ethtool_rss_create_act(ynl_cpp::ynl_socket& ys,
 		       ethtool_rss_create_act_req& req);
 
 /* ETHTOOL_MSG_RSS_CREATE_ACT - notify */
@@ -1679,7 +1679,7 @@ struct ethtool_rss_delete_act_req {
 /*
  * Delete an RSS context.
  */
-int ethtool_rss_delete_act(ynl_cpp::ynl_socket&  ys,
+int ethtool_rss_delete_act(ynl_cpp::ynl_socket& ys,
 			   ethtool_rss_delete_act_req& req);
 
 /* ETHTOOL_MSG_CABLE_TEST_NTF - event */
diff --git a/generated/fou-user.cpp b/generated/fou-user.cpp
index bb2246d..92dc640 100644
--- a/generated/fou-user.cpp
+++ b/generated/fou-user.cpp
@@ -82,7 +82,7 @@ struct ynl_policy_nest fou_nest = {
 /* Common nested types */
 /* ============== FOU_CMD_ADD ============== */
 /* FOU_CMD_ADD - do */
-int fou_add(ynl_cpp::ynl_socket&  ys, fou_add_req& req)
+int fou_add(ynl_cpp::ynl_socket& ys, fou_add_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -121,7 +121,7 @@ int fou_add(ynl_cpp::ynl_socket&  ys, fou_add_req& req)
 
 /* ============== FOU_CMD_DEL ============== */
 /* FOU_CMD_DEL - do */
-int fou_del(ynl_cpp::ynl_socket&  ys, fou_del_req& req)
+int fou_del(ynl_cpp::ynl_socket& ys, fou_del_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -215,8 +215,7 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg)
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<fou_get_rsp>
-fou_get(ynl_cpp::ynl_socket&  ys, fou_get_req& req)
+std::unique_ptr<fou_get_rsp> fou_get(ynl_cpp::ynl_socket& ys, fou_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<fou_get_rsp> rsp;
@@ -257,7 +256,7 @@ fou_get(ynl_cpp::ynl_socket&  ys, fou_get_req& req)
 }
 
 /* FOU_CMD_GET - dump */
-std::unique_ptr<fou_get_list> fou_get_dump(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<fou_get_list> fou_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
diff --git a/generated/fou-user.hpp b/generated/fou-user.hpp
index b30c286..5929a5b 100644
--- a/generated/fou-user.hpp
+++ b/generated/fou-user.hpp
@@ -47,7 +47,7 @@ struct fou_add_req {
 /*
  * Add port.
  */
-int fou_add(ynl_cpp::ynl_socket&  ys, fou_add_req& req);
+int fou_add(ynl_cpp::ynl_socket& ys, fou_add_req& req);
 
 /* ============== FOU_CMD_DEL ============== */
 /* FOU_CMD_DEL - do */
@@ -65,7 +65,7 @@ struct fou_del_req {
 /*
  * Delete port.
  */
-int fou_del(ynl_cpp::ynl_socket&  ys, fou_del_req& req);
+int fou_del(ynl_cpp::ynl_socket& ys, fou_del_req& req);
 
 /* ============== FOU_CMD_GET ============== */
 /* FOU_CMD_GET - do */
@@ -97,14 +97,14 @@ struct fou_get_rsp {
  * Get tunnel info.
  */
 std::unique_ptr<fou_get_rsp>
-fou_get(ynl_cpp::ynl_socket&  ys, fou_get_req& req);
+fou_get(ynl_cpp::ynl_socket& ys, fou_get_req& req);
 
 /* FOU_CMD_GET - dump */
 struct fou_get_list {
 	std::list<fou_get_rsp> objs;
 };
 
-std::unique_ptr<fou_get_list> fou_get_dump(ynl_cpp::ynl_socket&  ys);
+std::unique_ptr<fou_get_list> fou_get_dump(ynl_cpp::ynl_socket& ys);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_FOU_GEN_H */
diff --git a/generated/handshake-user.cpp b/generated/handshake-user.cpp
index 73be009..01d0eea 100644
--- a/generated/handshake-user.cpp
+++ b/generated/handshake-user.cpp
@@ -241,7 +241,7 @@ int handshake_accept_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<handshake_accept_rsp>
-handshake_accept(ynl_cpp::ynl_socket&  ys, handshake_accept_req& req)
+handshake_accept(ynl_cpp::ynl_socket& ys, handshake_accept_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<handshake_accept_rsp> rsp;
@@ -270,7 +270,7 @@ handshake_accept(ynl_cpp::ynl_socket&  ys, handshake_accept_req& req)
 /* HANDSHAKE_CMD_ACCEPT - notify */
 /* ============== HANDSHAKE_CMD_DONE ============== */
 /* HANDSHAKE_CMD_DONE - do */
-int handshake_done(ynl_cpp::ynl_socket&  ys, handshake_done_req& req)
+int handshake_done(ynl_cpp::ynl_socket& ys, handshake_done_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
diff --git a/generated/handshake-user.hpp b/generated/handshake-user.hpp
index 1c350a7..24a8272 100644
--- a/generated/handshake-user.hpp
+++ b/generated/handshake-user.hpp
@@ -57,7 +57,7 @@ struct handshake_accept_rsp {
  * Handler retrieves next queued handshake request
  */
 std::unique_ptr<handshake_accept_rsp>
-handshake_accept(ynl_cpp::ynl_socket&  ys, handshake_accept_req& req);
+handshake_accept(ynl_cpp::ynl_socket& ys, handshake_accept_req& req);
 
 /* HANDSHAKE_CMD_ACCEPT - notify */
 struct handshake_accept_ntf {
@@ -74,7 +74,7 @@ struct handshake_done_req {
 /*
  * Handler reports handshake completion
  */
-int handshake_done(ynl_cpp::ynl_socket&  ys, handshake_done_req& req);
+int handshake_done(ynl_cpp::ynl_socket& ys, handshake_done_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_HANDSHAKE_GEN_H */
diff --git a/generated/lockd-user.cpp b/generated/lockd-user.cpp
index 24d9c23..e59f7d1 100644
--- a/generated/lockd-user.cpp
+++ b/generated/lockd-user.cpp
@@ -48,7 +48,7 @@ struct ynl_policy_nest lockd_server_nest = {
 /* Common nested types */
 /* ============== LOCKD_CMD_SERVER_SET ============== */
 /* LOCKD_CMD_SERVER_SET - do */
-int lockd_server_set(ynl_cpp::ynl_socket&  ys, lockd_server_set_req& req)
+int lockd_server_set(ynl_cpp::ynl_socket& ys, lockd_server_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -102,8 +102,7 @@ int lockd_server_get_rsp_parse(const struct nlmsghdr *nlh,
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<lockd_server_get_rsp>
-lockd_server_get(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<lockd_server_get_rsp> lockd_server_get(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<lockd_server_get_rsp> rsp;
diff --git a/generated/lockd-user.hpp b/generated/lockd-user.hpp
index 945ae80..8d658c3 100644
--- a/generated/lockd-user.hpp
+++ b/generated/lockd-user.hpp
@@ -39,7 +39,7 @@ struct lockd_server_set_req {
 /*
  * set the lockd server parameters
  */
-int lockd_server_set(ynl_cpp::ynl_socket&  ys, lockd_server_set_req& req);
+int lockd_server_set(ynl_cpp::ynl_socket& ys, lockd_server_set_req& req);
 
 /* ============== LOCKD_CMD_SERVER_GET ============== */
 /* LOCKD_CMD_SERVER_GET - do */
@@ -54,7 +54,7 @@ struct lockd_server_get_rsp {
  * get the lockd server parameters
  */
 std::unique_ptr<lockd_server_get_rsp>
-lockd_server_get(ynl_cpp::ynl_socket&  ys);
+lockd_server_get(ynl_cpp::ynl_socket& ys);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_LOCKD_GEN_H */
diff --git a/generated/mptcp_pm-user.cpp b/generated/mptcp_pm-user.cpp
index ffc6dfc..00586cc 100644
--- a/generated/mptcp_pm-user.cpp
+++ b/generated/mptcp_pm-user.cpp
@@ -199,7 +199,7 @@ int mptcp_pm_address_parse(struct ynl_parse_arg *yarg,
 
 /* ============== MPTCP_PM_CMD_ADD_ADDR ============== */
 /* MPTCP_PM_CMD_ADD_ADDR - do */
-int mptcp_pm_add_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_add_addr_req& req)
+int mptcp_pm_add_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_add_addr_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -220,7 +220,7 @@ int mptcp_pm_add_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_add_addr_req& req)
 
 /* ============== MPTCP_PM_CMD_DEL_ADDR ============== */
 /* MPTCP_PM_CMD_DEL_ADDR - do */
-int mptcp_pm_del_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_del_addr_req& req)
+int mptcp_pm_del_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_del_addr_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -269,7 +269,7 @@ int mptcp_pm_get_addr_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<mptcp_pm_get_addr_rsp>
-mptcp_pm_get_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_addr_req& req)
+mptcp_pm_get_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_get_addr_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<mptcp_pm_get_addr_rsp> rsp;
@@ -299,7 +299,7 @@ mptcp_pm_get_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_addr_req& req)
 
 /* MPTCP_PM_CMD_GET_ADDR - dump */
 std::unique_ptr<mptcp_pm_get_addr_list>
-mptcp_pm_get_addr_dump(ynl_cpp::ynl_socket&  ys)
+mptcp_pm_get_addr_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -324,7 +324,7 @@ mptcp_pm_get_addr_dump(ynl_cpp::ynl_socket&  ys)
 
 /* ============== MPTCP_PM_CMD_FLUSH_ADDRS ============== */
 /* MPTCP_PM_CMD_FLUSH_ADDRS - do */
-int mptcp_pm_flush_addrs(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_flush_addrs(ynl_cpp::ynl_socket& ys,
 			 mptcp_pm_flush_addrs_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -346,7 +346,7 @@ int mptcp_pm_flush_addrs(ynl_cpp::ynl_socket&  ys,
 
 /* ============== MPTCP_PM_CMD_SET_LIMITS ============== */
 /* MPTCP_PM_CMD_SET_LIMITS - do */
-int mptcp_pm_set_limits(ynl_cpp::ynl_socket&  ys, mptcp_pm_set_limits_req& req)
+int mptcp_pm_set_limits(ynl_cpp::ynl_socket& ys, mptcp_pm_set_limits_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -395,7 +395,7 @@ int mptcp_pm_get_limits_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<mptcp_pm_get_limits_rsp>
-mptcp_pm_get_limits(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_limits_req& req)
+mptcp_pm_get_limits(ynl_cpp::ynl_socket& ys, mptcp_pm_get_limits_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<mptcp_pm_get_limits_rsp> rsp;
@@ -425,7 +425,7 @@ mptcp_pm_get_limits(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_limits_req& req)
 
 /* ============== MPTCP_PM_CMD_SET_FLAGS ============== */
 /* MPTCP_PM_CMD_SET_FLAGS - do */
-int mptcp_pm_set_flags(ynl_cpp::ynl_socket&  ys, mptcp_pm_set_flags_req& req)
+int mptcp_pm_set_flags(ynl_cpp::ynl_socket& ys, mptcp_pm_set_flags_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -450,7 +450,7 @@ int mptcp_pm_set_flags(ynl_cpp::ynl_socket&  ys, mptcp_pm_set_flags_req& req)
 
 /* ============== MPTCP_PM_CMD_ANNOUNCE ============== */
 /* MPTCP_PM_CMD_ANNOUNCE - do */
-int mptcp_pm_announce(ynl_cpp::ynl_socket&  ys, mptcp_pm_announce_req& req)
+int mptcp_pm_announce(ynl_cpp::ynl_socket& ys, mptcp_pm_announce_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -473,7 +473,7 @@ int mptcp_pm_announce(ynl_cpp::ynl_socket&  ys, mptcp_pm_announce_req& req)
 
 /* ============== MPTCP_PM_CMD_REMOVE ============== */
 /* MPTCP_PM_CMD_REMOVE - do */
-int mptcp_pm_remove(ynl_cpp::ynl_socket&  ys, mptcp_pm_remove_req& req)
+int mptcp_pm_remove(ynl_cpp::ynl_socket& ys, mptcp_pm_remove_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -496,7 +496,7 @@ int mptcp_pm_remove(ynl_cpp::ynl_socket&  ys, mptcp_pm_remove_req& req)
 
 /* ============== MPTCP_PM_CMD_SUBFLOW_CREATE ============== */
 /* MPTCP_PM_CMD_SUBFLOW_CREATE - do */
-int mptcp_pm_subflow_create(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_subflow_create(ynl_cpp::ynl_socket& ys,
 			    mptcp_pm_subflow_create_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -522,7 +522,7 @@ int mptcp_pm_subflow_create(ynl_cpp::ynl_socket&  ys,
 
 /* ============== MPTCP_PM_CMD_SUBFLOW_DESTROY ============== */
 /* MPTCP_PM_CMD_SUBFLOW_DESTROY - do */
-int mptcp_pm_subflow_destroy(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_subflow_destroy(ynl_cpp::ynl_socket& ys,
 			     mptcp_pm_subflow_destroy_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
diff --git a/generated/mptcp_pm-user.hpp b/generated/mptcp_pm-user.hpp
index 45c5a23..2e6f539 100644
--- a/generated/mptcp_pm-user.hpp
+++ b/generated/mptcp_pm-user.hpp
@@ -48,7 +48,7 @@ struct mptcp_pm_add_addr_req {
 /*
  * Add endpoint
  */
-int mptcp_pm_add_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_add_addr_req& req);
+int mptcp_pm_add_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_add_addr_req& req);
 
 /* ============== MPTCP_PM_CMD_DEL_ADDR ============== */
 /* MPTCP_PM_CMD_DEL_ADDR - do */
@@ -59,7 +59,7 @@ struct mptcp_pm_del_addr_req {
 /*
  * Delete endpoint
  */
-int mptcp_pm_del_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_del_addr_req& req);
+int mptcp_pm_del_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_del_addr_req& req);
 
 /* ============== MPTCP_PM_CMD_GET_ADDR ============== */
 /* MPTCP_PM_CMD_GET_ADDR - do */
@@ -76,7 +76,7 @@ struct mptcp_pm_get_addr_rsp {
  * Get endpoint information
  */
 std::unique_ptr<mptcp_pm_get_addr_rsp>
-mptcp_pm_get_addr(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_addr_req& req);
+mptcp_pm_get_addr(ynl_cpp::ynl_socket& ys, mptcp_pm_get_addr_req& req);
 
 /* MPTCP_PM_CMD_GET_ADDR - dump */
 struct mptcp_pm_get_addr_list {
@@ -84,7 +84,7 @@ struct mptcp_pm_get_addr_list {
 };
 
 std::unique_ptr<mptcp_pm_get_addr_list>
-mptcp_pm_get_addr_dump(ynl_cpp::ynl_socket&  ys);
+mptcp_pm_get_addr_dump(ynl_cpp::ynl_socket& ys);
 
 /* ============== MPTCP_PM_CMD_FLUSH_ADDRS ============== */
 /* MPTCP_PM_CMD_FLUSH_ADDRS - do */
@@ -95,7 +95,7 @@ struct mptcp_pm_flush_addrs_req {
 /*
  * Flush addresses
  */
-int mptcp_pm_flush_addrs(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_flush_addrs(ynl_cpp::ynl_socket& ys,
 			 mptcp_pm_flush_addrs_req& req);
 
 /* ============== MPTCP_PM_CMD_SET_LIMITS ============== */
@@ -108,7 +108,7 @@ struct mptcp_pm_set_limits_req {
 /*
  * Set protocol limits
  */
-int mptcp_pm_set_limits(ynl_cpp::ynl_socket&  ys, mptcp_pm_set_limits_req& req);
+int mptcp_pm_set_limits(ynl_cpp::ynl_socket& ys, mptcp_pm_set_limits_req& req);
 
 /* ============== MPTCP_PM_CMD_GET_LIMITS ============== */
 /* MPTCP_PM_CMD_GET_LIMITS - do */
@@ -126,7 +126,7 @@ struct mptcp_pm_get_limits_rsp {
  * Get protocol limits
  */
 std::unique_ptr<mptcp_pm_get_limits_rsp>
-mptcp_pm_get_limits(ynl_cpp::ynl_socket&  ys, mptcp_pm_get_limits_req& req);
+mptcp_pm_get_limits(ynl_cpp::ynl_socket& ys, mptcp_pm_get_limits_req& req);
 
 /* ============== MPTCP_PM_CMD_SET_FLAGS ============== */
 /* MPTCP_PM_CMD_SET_FLAGS - do */
@@ -139,7 +139,7 @@ struct mptcp_pm_set_flags_req {
 /*
  * Change endpoint flags
  */
-int mptcp_pm_set_flags(ynl_cpp::ynl_socket&  ys, mptcp_pm_set_flags_req& req);
+int mptcp_pm_set_flags(ynl_cpp::ynl_socket& ys, mptcp_pm_set_flags_req& req);
 
 /* ============== MPTCP_PM_CMD_ANNOUNCE ============== */
 /* MPTCP_PM_CMD_ANNOUNCE - do */
@@ -151,7 +151,7 @@ struct mptcp_pm_announce_req {
 /*
  * Announce new address
  */
-int mptcp_pm_announce(ynl_cpp::ynl_socket&  ys, mptcp_pm_announce_req& req);
+int mptcp_pm_announce(ynl_cpp::ynl_socket& ys, mptcp_pm_announce_req& req);
 
 /* ============== MPTCP_PM_CMD_REMOVE ============== */
 /* MPTCP_PM_CMD_REMOVE - do */
@@ -163,7 +163,7 @@ struct mptcp_pm_remove_req {
 /*
  * Announce removal
  */
-int mptcp_pm_remove(ynl_cpp::ynl_socket&  ys, mptcp_pm_remove_req& req);
+int mptcp_pm_remove(ynl_cpp::ynl_socket& ys, mptcp_pm_remove_req& req);
 
 /* ============== MPTCP_PM_CMD_SUBFLOW_CREATE ============== */
 /* MPTCP_PM_CMD_SUBFLOW_CREATE - do */
@@ -176,7 +176,7 @@ struct mptcp_pm_subflow_create_req {
 /*
  * Create subflow
  */
-int mptcp_pm_subflow_create(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_subflow_create(ynl_cpp::ynl_socket& ys,
 			    mptcp_pm_subflow_create_req& req);
 
 /* ============== MPTCP_PM_CMD_SUBFLOW_DESTROY ============== */
@@ -190,7 +190,7 @@ struct mptcp_pm_subflow_destroy_req {
 /*
  * Destroy subflow
  */
-int mptcp_pm_subflow_destroy(ynl_cpp::ynl_socket&  ys,
+int mptcp_pm_subflow_destroy(ynl_cpp::ynl_socket& ys,
 			     mptcp_pm_subflow_destroy_req& req);
 
 } //namespace ynl_cpp
diff --git a/generated/net_shaper-user.cpp b/generated/net_shaper-user.cpp
index 215c5cb..125b487 100644
--- a/generated/net_shaper-user.cpp
+++ b/generated/net_shaper-user.cpp
@@ -278,7 +278,7 @@ int net_shaper_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<net_shaper_get_rsp>
-net_shaper_get(ynl_cpp::ynl_socket&  ys, net_shaper_get_req& req)
+net_shaper_get(ynl_cpp::ynl_socket& ys, net_shaper_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<net_shaper_get_rsp> rsp;
@@ -308,7 +308,7 @@ net_shaper_get(ynl_cpp::ynl_socket&  ys, net_shaper_get_req& req)
 
 /* NET_SHAPER_CMD_GET - dump */
 std::unique_ptr<net_shaper_get_list>
-net_shaper_get_dump(ynl_cpp::ynl_socket&  ys, net_shaper_get_req_dump& req)
+net_shaper_get_dump(ynl_cpp::ynl_socket& ys, net_shaper_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -337,7 +337,7 @@ net_shaper_get_dump(ynl_cpp::ynl_socket&  ys, net_shaper_get_req_dump& req)
 
 /* ============== NET_SHAPER_CMD_SET ============== */
 /* NET_SHAPER_CMD_SET - do */
-int net_shaper_set(ynl_cpp::ynl_socket&  ys, net_shaper_set_req& req)
+int net_shaper_set(ynl_cpp::ynl_socket& ys, net_shaper_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -372,7 +372,7 @@ int net_shaper_set(ynl_cpp::ynl_socket&  ys, net_shaper_set_req& req)
 
 /* ============== NET_SHAPER_CMD_DELETE ============== */
 /* NET_SHAPER_CMD_DELETE - do */
-int net_shaper_delete(ynl_cpp::ynl_socket&  ys, net_shaper_delete_req& req)
+int net_shaper_delete(ynl_cpp::ynl_socket& ys, net_shaper_delete_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -427,7 +427,7 @@ int net_shaper_group_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<net_shaper_group_rsp>
-net_shaper_group(ynl_cpp::ynl_socket&  ys, net_shaper_group_req& req)
+net_shaper_group(ynl_cpp::ynl_socket& ys, net_shaper_group_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<net_shaper_group_rsp> rsp;
@@ -523,7 +523,7 @@ int net_shaper_cap_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<net_shaper_cap_get_rsp>
-net_shaper_cap_get(ynl_cpp::ynl_socket&  ys, net_shaper_cap_get_req& req)
+net_shaper_cap_get(ynl_cpp::ynl_socket& ys, net_shaper_cap_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<net_shaper_cap_get_rsp> rsp;
@@ -553,7 +553,7 @@ net_shaper_cap_get(ynl_cpp::ynl_socket&  ys, net_shaper_cap_get_req& req)
 
 /* NET_SHAPER_CMD_CAP_GET - dump */
 std::unique_ptr<net_shaper_cap_get_list>
-net_shaper_cap_get_dump(ynl_cpp::ynl_socket&  ys,
+net_shaper_cap_get_dump(ynl_cpp::ynl_socket& ys,
 			net_shaper_cap_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
diff --git a/generated/net_shaper-user.hpp b/generated/net_shaper-user.hpp
index 90957e2..99b242f 100644
--- a/generated/net_shaper-user.hpp
+++ b/generated/net_shaper-user.hpp
@@ -65,7 +65,7 @@ struct net_shaper_get_rsp {
 
  */
 std::unique_ptr<net_shaper_get_rsp>
-net_shaper_get(ynl_cpp::ynl_socket&  ys, net_shaper_get_req& req);
+net_shaper_get(ynl_cpp::ynl_socket& ys, net_shaper_get_req& req);
 
 /* NET_SHAPER_CMD_GET - dump */
 struct net_shaper_get_req_dump {
@@ -77,7 +77,7 @@ struct net_shaper_get_list {
 };
 
 std::unique_ptr<net_shaper_get_list>
-net_shaper_get_dump(ynl_cpp::ynl_socket&  ys, net_shaper_get_req_dump& req);
+net_shaper_get_dump(ynl_cpp::ynl_socket& ys, net_shaper_get_req_dump& req);
 
 /* ============== NET_SHAPER_CMD_SET ============== */
 /* NET_SHAPER_CMD_SET - do */
@@ -98,7 +98,7 @@ The set operation can't be used to create a @node scope shaper,
 use the @group operation instead.
 
  */
-int net_shaper_set(ynl_cpp::ynl_socket&  ys, net_shaper_set_req& req);
+int net_shaper_set(ynl_cpp::ynl_socket& ys, net_shaper_set_req& req);
 
 /* ============== NET_SHAPER_CMD_DELETE ============== */
 /* NET_SHAPER_CMD_DELETE - do */
@@ -121,7 +121,7 @@ node with infinite bandwidth. The queue's implicit node
 feeds an implicit RR node at the root of the hierarchy.
 
  */
-int net_shaper_delete(ynl_cpp::ynl_socket&  ys, net_shaper_delete_req& req);
+int net_shaper_delete(ynl_cpp::ynl_socket& ys, net_shaper_delete_req& req);
 
 /* ============== NET_SHAPER_CMD_GROUP ============== */
 /* NET_SHAPER_CMD_GROUP - do */
@@ -166,7 +166,7 @@ as the reply.
 
  */
 std::unique_ptr<net_shaper_group_rsp>
-net_shaper_group(ynl_cpp::ynl_socket&  ys, net_shaper_group_req& req);
+net_shaper_group(ynl_cpp::ynl_socket& ys, net_shaper_group_req& req);
 
 /* ============== NET_SHAPER_CMD_CAP_GET ============== */
 /* NET_SHAPER_CMD_CAP_GET - do */
@@ -194,7 +194,7 @@ for the specified scope.
 
  */
 std::unique_ptr<net_shaper_cap_get_rsp>
-net_shaper_cap_get(ynl_cpp::ynl_socket&  ys, net_shaper_cap_get_req& req);
+net_shaper_cap_get(ynl_cpp::ynl_socket& ys, net_shaper_cap_get_req& req);
 
 /* NET_SHAPER_CMD_CAP_GET - dump */
 struct net_shaper_cap_get_req_dump {
@@ -206,7 +206,7 @@ struct net_shaper_cap_get_list {
 };
 
 std::unique_ptr<net_shaper_cap_get_list>
-net_shaper_cap_get_dump(ynl_cpp::ynl_socket&  ys,
+net_shaper_cap_get_dump(ynl_cpp::ynl_socket& ys,
 			net_shaper_cap_get_req_dump& req);
 
 } //namespace ynl_cpp
diff --git a/generated/netdev-user.cpp b/generated/netdev-user.cpp
index e6ed5dc..e390ee6 100644
--- a/generated/netdev-user.cpp
+++ b/generated/netdev-user.cpp
@@ -531,7 +531,7 @@ int netdev_dev_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_dev_get_rsp>
-netdev_dev_get(ynl_cpp::ynl_socket&  ys, netdev_dev_get_req& req)
+netdev_dev_get(ynl_cpp::ynl_socket& ys, netdev_dev_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_dev_get_rsp> rsp;
@@ -559,7 +559,7 @@ netdev_dev_get(ynl_cpp::ynl_socket&  ys, netdev_dev_get_req& req)
 
 /* NETDEV_CMD_DEV_GET - dump */
 std::unique_ptr<netdev_dev_get_list>
-netdev_dev_get_dump(ynl_cpp::ynl_socket&  ys)
+netdev_dev_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -641,7 +641,7 @@ int netdev_page_pool_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_page_pool_get_rsp>
-netdev_page_pool_get(ynl_cpp::ynl_socket&  ys, netdev_page_pool_get_req& req)
+netdev_page_pool_get(ynl_cpp::ynl_socket& ys, netdev_page_pool_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_page_pool_get_rsp> rsp;
@@ -669,7 +669,7 @@ netdev_page_pool_get(ynl_cpp::ynl_socket&  ys, netdev_page_pool_get_req& req)
 
 /* NETDEV_CMD_PAGE_POOL_GET - dump */
 std::unique_ptr<netdev_page_pool_get_list>
-netdev_page_pool_get_dump(ynl_cpp::ynl_socket&  ys)
+netdev_page_pool_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -767,7 +767,7 @@ int netdev_page_pool_stats_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_page_pool_stats_get_rsp>
-netdev_page_pool_stats_get(ynl_cpp::ynl_socket&  ys,
+netdev_page_pool_stats_get(ynl_cpp::ynl_socket& ys,
 			   netdev_page_pool_stats_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
@@ -796,7 +796,7 @@ netdev_page_pool_stats_get(ynl_cpp::ynl_socket&  ys,
 
 /* NETDEV_CMD_PAGE_POOL_STATS_GET - dump */
 std::unique_ptr<netdev_page_pool_stats_get_list>
-netdev_page_pool_stats_get_dump(ynl_cpp::ynl_socket&  ys)
+netdev_page_pool_stats_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -877,7 +877,7 @@ int netdev_queue_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_queue_get_rsp>
-netdev_queue_get(ynl_cpp::ynl_socket&  ys, netdev_queue_get_req& req)
+netdev_queue_get(ynl_cpp::ynl_socket& ys, netdev_queue_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_queue_get_rsp> rsp;
@@ -909,7 +909,7 @@ netdev_queue_get(ynl_cpp::ynl_socket&  ys, netdev_queue_get_req& req)
 
 /* NETDEV_CMD_QUEUE_GET - dump */
 std::unique_ptr<netdev_queue_get_list>
-netdev_queue_get_dump(ynl_cpp::ynl_socket&  ys, netdev_queue_get_req_dump& req)
+netdev_queue_get_dump(ynl_cpp::ynl_socket& ys, netdev_queue_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -988,7 +988,7 @@ int netdev_napi_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_napi_get_rsp>
-netdev_napi_get(ynl_cpp::ynl_socket&  ys, netdev_napi_get_req& req)
+netdev_napi_get(ynl_cpp::ynl_socket& ys, netdev_napi_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_napi_get_rsp> rsp;
@@ -1016,7 +1016,7 @@ netdev_napi_get(ynl_cpp::ynl_socket&  ys, netdev_napi_get_req& req)
 
 /* NETDEV_CMD_NAPI_GET - dump */
 std::unique_ptr<netdev_napi_get_list>
-netdev_napi_get_dump(ynl_cpp::ynl_socket&  ys, netdev_napi_get_req_dump& req)
+netdev_napi_get_dump(ynl_cpp::ynl_socket& ys, netdev_napi_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -1091,7 +1091,7 @@ int netdev_qstats_get_rsp_dump_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_qstats_get_rsp_list>
-netdev_qstats_get_dump(ynl_cpp::ynl_socket&  ys,
+netdev_qstats_get_dump(ynl_cpp::ynl_socket& ys,
 		       netdev_qstats_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -1145,7 +1145,7 @@ int netdev_bind_rx_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_bind_rx_rsp>
-netdev_bind_rx(ynl_cpp::ynl_socket&  ys, netdev_bind_rx_req& req)
+netdev_bind_rx(ynl_cpp::ynl_socket& ys, netdev_bind_rx_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_bind_rx_rsp> rsp;
@@ -1177,7 +1177,7 @@ netdev_bind_rx(ynl_cpp::ynl_socket&  ys, netdev_bind_rx_req& req)
 
 /* ============== NETDEV_CMD_NAPI_SET ============== */
 /* NETDEV_CMD_NAPI_SET - do */
-int netdev_napi_set(ynl_cpp::ynl_socket&  ys, netdev_napi_set_req& req)
+int netdev_napi_set(ynl_cpp::ynl_socket& ys, netdev_napi_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -1228,7 +1228,7 @@ int netdev_bind_tx_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<netdev_bind_tx_rsp>
-netdev_bind_tx(ynl_cpp::ynl_socket&  ys, netdev_bind_tx_req& req)
+netdev_bind_tx(ynl_cpp::ynl_socket& ys, netdev_bind_tx_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<netdev_bind_tx_rsp> rsp;
diff --git a/generated/netdev-user.hpp b/generated/netdev-user.hpp
index ba8d8c7..2aa1ede 100644
--- a/generated/netdev-user.hpp
+++ b/generated/netdev-user.hpp
@@ -68,7 +68,7 @@ struct netdev_dev_get_rsp {
  * Get / dump information about a netdev.
  */
 std::unique_ptr<netdev_dev_get_rsp>
-netdev_dev_get(ynl_cpp::ynl_socket&  ys, netdev_dev_get_req& req);
+netdev_dev_get(ynl_cpp::ynl_socket& ys, netdev_dev_get_req& req);
 
 /* NETDEV_CMD_DEV_GET - dump */
 struct netdev_dev_get_list {
@@ -76,7 +76,7 @@ struct netdev_dev_get_list {
 };
 
 std::unique_ptr<netdev_dev_get_list>
-netdev_dev_get_dump(ynl_cpp::ynl_socket&  ys);
+netdev_dev_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* NETDEV_CMD_DEV_GET - notify */
 struct netdev_dev_get_ntf {
@@ -105,7 +105,7 @@ struct netdev_page_pool_get_rsp {
 
  */
 std::unique_ptr<netdev_page_pool_get_rsp>
-netdev_page_pool_get(ynl_cpp::ynl_socket&  ys, netdev_page_pool_get_req& req);
+netdev_page_pool_get(ynl_cpp::ynl_socket& ys, netdev_page_pool_get_req& req);
 
 /* NETDEV_CMD_PAGE_POOL_GET - dump */
 struct netdev_page_pool_get_list {
@@ -113,7 +113,7 @@ struct netdev_page_pool_get_list {
 };
 
 std::unique_ptr<netdev_page_pool_get_list>
-netdev_page_pool_get_dump(ynl_cpp::ynl_socket&  ys);
+netdev_page_pool_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* NETDEV_CMD_PAGE_POOL_GET - notify */
 struct netdev_page_pool_get_ntf {
@@ -144,7 +144,7 @@ struct netdev_page_pool_stats_get_rsp {
  * Get page pool statistics.
  */
 std::unique_ptr<netdev_page_pool_stats_get_rsp>
-netdev_page_pool_stats_get(ynl_cpp::ynl_socket&  ys,
+netdev_page_pool_stats_get(ynl_cpp::ynl_socket& ys,
 			   netdev_page_pool_stats_get_req& req);
 
 /* NETDEV_CMD_PAGE_POOL_STATS_GET - dump */
@@ -153,7 +153,7 @@ struct netdev_page_pool_stats_get_list {
 };
 
 std::unique_ptr<netdev_page_pool_stats_get_list>
-netdev_page_pool_stats_get_dump(ynl_cpp::ynl_socket&  ys);
+netdev_page_pool_stats_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* ============== NETDEV_CMD_QUEUE_GET ============== */
 /* NETDEV_CMD_QUEUE_GET - do */
@@ -177,7 +177,7 @@ struct netdev_queue_get_rsp {
  * Get queue information from the kernel. Only configured queues will be reported (as opposed to all available hardware queues).
  */
 std::unique_ptr<netdev_queue_get_rsp>
-netdev_queue_get(ynl_cpp::ynl_socket&  ys, netdev_queue_get_req& req);
+netdev_queue_get(ynl_cpp::ynl_socket& ys, netdev_queue_get_req& req);
 
 /* NETDEV_CMD_QUEUE_GET - dump */
 struct netdev_queue_get_req_dump {
@@ -189,7 +189,7 @@ struct netdev_queue_get_list {
 };
 
 std::unique_ptr<netdev_queue_get_list>
-netdev_queue_get_dump(ynl_cpp::ynl_socket&  ys, netdev_queue_get_req_dump& req);
+netdev_queue_get_dump(ynl_cpp::ynl_socket& ys, netdev_queue_get_req_dump& req);
 
 /* ============== NETDEV_CMD_NAPI_GET ============== */
 /* NETDEV_CMD_NAPI_GET - do */
@@ -212,7 +212,7 @@ struct netdev_napi_get_rsp {
  * Get information about NAPI instances configured on the system.
  */
 std::unique_ptr<netdev_napi_get_rsp>
-netdev_napi_get(ynl_cpp::ynl_socket&  ys, netdev_napi_get_req& req);
+netdev_napi_get(ynl_cpp::ynl_socket& ys, netdev_napi_get_req& req);
 
 /* NETDEV_CMD_NAPI_GET - dump */
 struct netdev_napi_get_req_dump {
@@ -224,7 +224,7 @@ struct netdev_napi_get_list {
 };
 
 std::unique_ptr<netdev_napi_get_list>
-netdev_napi_get_dump(ynl_cpp::ynl_socket&  ys, netdev_napi_get_req_dump& req);
+netdev_napi_get_dump(ynl_cpp::ynl_socket& ys, netdev_napi_get_req_dump& req);
 
 /* ============== NETDEV_CMD_QSTATS_GET ============== */
 /* NETDEV_CMD_QSTATS_GET - dump */
@@ -248,7 +248,7 @@ struct netdev_qstats_get_rsp_list {
 };
 
 std::unique_ptr<netdev_qstats_get_rsp_list>
-netdev_qstats_get_dump(ynl_cpp::ynl_socket&  ys,
+netdev_qstats_get_dump(ynl_cpp::ynl_socket& ys,
 		       netdev_qstats_get_req_dump& req);
 
 /* ============== NETDEV_CMD_BIND_RX ============== */
@@ -267,7 +267,7 @@ struct netdev_bind_rx_rsp {
  * Bind dmabuf to netdev
  */
 std::unique_ptr<netdev_bind_rx_rsp>
-netdev_bind_rx(ynl_cpp::ynl_socket&  ys, netdev_bind_rx_req& req);
+netdev_bind_rx(ynl_cpp::ynl_socket& ys, netdev_bind_rx_req& req);
 
 /* ============== NETDEV_CMD_NAPI_SET ============== */
 /* NETDEV_CMD_NAPI_SET - do */
@@ -282,7 +282,7 @@ struct netdev_napi_set_req {
 /*
  * Set configurable NAPI instance settings.
  */
-int netdev_napi_set(ynl_cpp::ynl_socket&  ys, netdev_napi_set_req& req);
+int netdev_napi_set(ynl_cpp::ynl_socket& ys, netdev_napi_set_req& req);
 
 /* ============== NETDEV_CMD_BIND_TX ============== */
 /* NETDEV_CMD_BIND_TX - do */
@@ -299,7 +299,7 @@ struct netdev_bind_tx_rsp {
  * Bind dmabuf to netdev for TX
  */
 std::unique_ptr<netdev_bind_tx_rsp>
-netdev_bind_tx(ynl_cpp::ynl_socket&  ys, netdev_bind_tx_req& req);
+netdev_bind_tx(ynl_cpp::ynl_socket& ys, netdev_bind_tx_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_NETDEV_GEN_H */
diff --git a/generated/nfsd-user.cpp b/generated/nfsd-user.cpp
index 79b3f71..c131478 100644
--- a/generated/nfsd-user.cpp
+++ b/generated/nfsd-user.cpp
@@ -334,7 +334,7 @@ int nfsd_rpc_status_get_rsp_dump_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nfsd_rpc_status_get_rsp_list>
-nfsd_rpc_status_get_dump(ynl_cpp::ynl_socket&  ys)
+nfsd_rpc_status_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -359,7 +359,7 @@ nfsd_rpc_status_get_dump(ynl_cpp::ynl_socket&  ys)
 
 /* ============== NFSD_CMD_THREADS_SET ============== */
 /* NFSD_CMD_THREADS_SET - do */
-int nfsd_threads_set(ynl_cpp::ynl_socket&  ys, nfsd_threads_set_req& req)
+int nfsd_threads_set(ynl_cpp::ynl_socket& ys, nfsd_threads_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -433,8 +433,7 @@ int nfsd_threads_get_rsp_parse(const struct nlmsghdr *nlh,
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<nfsd_threads_get_rsp>
-nfsd_threads_get(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<nfsd_threads_get_rsp> nfsd_threads_get(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nfsd_threads_get_rsp> rsp;
@@ -459,7 +458,7 @@ nfsd_threads_get(ynl_cpp::ynl_socket&  ys)
 
 /* ============== NFSD_CMD_VERSION_SET ============== */
 /* NFSD_CMD_VERSION_SET - do */
-int nfsd_version_set(ynl_cpp::ynl_socket&  ys, nfsd_version_set_req& req)
+int nfsd_version_set(ynl_cpp::ynl_socket& ys, nfsd_version_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -520,8 +519,7 @@ int nfsd_version_get_rsp_parse(const struct nlmsghdr *nlh,
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<nfsd_version_get_rsp>
-nfsd_version_get(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<nfsd_version_get_rsp> nfsd_version_get(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nfsd_version_get_rsp> rsp;
@@ -546,7 +544,7 @@ nfsd_version_get(ynl_cpp::ynl_socket&  ys)
 
 /* ============== NFSD_CMD_LISTENER_SET ============== */
 /* NFSD_CMD_LISTENER_SET - do */
-int nfsd_listener_set(ynl_cpp::ynl_socket&  ys, nfsd_listener_set_req& req)
+int nfsd_listener_set(ynl_cpp::ynl_socket& ys, nfsd_listener_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -608,7 +606,7 @@ int nfsd_listener_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nfsd_listener_get_rsp>
-nfsd_listener_get(ynl_cpp::ynl_socket&  ys)
+nfsd_listener_get(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nfsd_listener_get_rsp> rsp;
@@ -633,7 +631,7 @@ nfsd_listener_get(ynl_cpp::ynl_socket&  ys)
 
 /* ============== NFSD_CMD_POOL_MODE_SET ============== */
 /* NFSD_CMD_POOL_MODE_SET - do */
-int nfsd_pool_mode_set(ynl_cpp::ynl_socket&  ys, nfsd_pool_mode_set_req& req)
+int nfsd_pool_mode_set(ynl_cpp::ynl_socket& ys, nfsd_pool_mode_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -680,7 +678,7 @@ int nfsd_pool_mode_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nfsd_pool_mode_get_rsp>
-nfsd_pool_mode_get(ynl_cpp::ynl_socket&  ys)
+nfsd_pool_mode_get(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nfsd_pool_mode_get_rsp> rsp;
diff --git a/generated/nfsd-user.hpp b/generated/nfsd-user.hpp
index b575526..a6991aa 100644
--- a/generated/nfsd-user.hpp
+++ b/generated/nfsd-user.hpp
@@ -62,7 +62,7 @@ struct nfsd_rpc_status_get_rsp_list {
 };
 
 std::unique_ptr<nfsd_rpc_status_get_rsp_list>
-nfsd_rpc_status_get_dump(ynl_cpp::ynl_socket&  ys);
+nfsd_rpc_status_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* ============== NFSD_CMD_THREADS_SET ============== */
 /* NFSD_CMD_THREADS_SET - do */
@@ -76,7 +76,7 @@ struct nfsd_threads_set_req {
 /*
  * set the number of running threads
  */
-int nfsd_threads_set(ynl_cpp::ynl_socket&  ys, nfsd_threads_set_req& req);
+int nfsd_threads_set(ynl_cpp::ynl_socket& ys, nfsd_threads_set_req& req);
 
 /* ============== NFSD_CMD_THREADS_GET ============== */
 /* NFSD_CMD_THREADS_GET - do */
@@ -92,7 +92,7 @@ struct nfsd_threads_get_rsp {
  * get the number of running threads
  */
 std::unique_ptr<nfsd_threads_get_rsp>
-nfsd_threads_get(ynl_cpp::ynl_socket&  ys);
+nfsd_threads_get(ynl_cpp::ynl_socket& ys);
 
 /* ============== NFSD_CMD_VERSION_SET ============== */
 /* NFSD_CMD_VERSION_SET - do */
@@ -103,7 +103,7 @@ struct nfsd_version_set_req {
 /*
  * set nfs enabled versions
  */
-int nfsd_version_set(ynl_cpp::ynl_socket&  ys, nfsd_version_set_req& req);
+int nfsd_version_set(ynl_cpp::ynl_socket& ys, nfsd_version_set_req& req);
 
 /* ============== NFSD_CMD_VERSION_GET ============== */
 /* NFSD_CMD_VERSION_GET - do */
@@ -116,7 +116,7 @@ struct nfsd_version_get_rsp {
  * get nfs enabled versions
  */
 std::unique_ptr<nfsd_version_get_rsp>
-nfsd_version_get(ynl_cpp::ynl_socket&  ys);
+nfsd_version_get(ynl_cpp::ynl_socket& ys);
 
 /* ============== NFSD_CMD_LISTENER_SET ============== */
 /* NFSD_CMD_LISTENER_SET - do */
@@ -127,7 +127,7 @@ struct nfsd_listener_set_req {
 /*
  * set nfs running sockets
  */
-int nfsd_listener_set(ynl_cpp::ynl_socket&  ys, nfsd_listener_set_req& req);
+int nfsd_listener_set(ynl_cpp::ynl_socket& ys, nfsd_listener_set_req& req);
 
 /* ============== NFSD_CMD_LISTENER_GET ============== */
 /* NFSD_CMD_LISTENER_GET - do */
@@ -140,7 +140,7 @@ struct nfsd_listener_get_rsp {
  * get nfs running listeners
  */
 std::unique_ptr<nfsd_listener_get_rsp>
-nfsd_listener_get(ynl_cpp::ynl_socket&  ys);
+nfsd_listener_get(ynl_cpp::ynl_socket& ys);
 
 /* ============== NFSD_CMD_POOL_MODE_SET ============== */
 /* NFSD_CMD_POOL_MODE_SET - do */
@@ -151,7 +151,7 @@ struct nfsd_pool_mode_set_req {
 /*
  * set the current server pool-mode
  */
-int nfsd_pool_mode_set(ynl_cpp::ynl_socket&  ys, nfsd_pool_mode_set_req& req);
+int nfsd_pool_mode_set(ynl_cpp::ynl_socket& ys, nfsd_pool_mode_set_req& req);
 
 /* ============== NFSD_CMD_POOL_MODE_GET ============== */
 /* NFSD_CMD_POOL_MODE_GET - do */
@@ -165,7 +165,7 @@ struct nfsd_pool_mode_get_rsp {
  * get info about server pool-mode
  */
 std::unique_ptr<nfsd_pool_mode_get_rsp>
-nfsd_pool_mode_get(ynl_cpp::ynl_socket&  ys);
+nfsd_pool_mode_get(ynl_cpp::ynl_socket& ys);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_NFSD_GEN_H */
diff --git a/generated/nl80211-user.cpp b/generated/nl80211-user.cpp
index b3f4833..3b91f60 100644
--- a/generated/nl80211-user.cpp
+++ b/generated/nl80211-user.cpp
@@ -2770,7 +2770,7 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nl80211_get_wiphy_rsp>
-nl80211_get_wiphy(ynl_cpp::ynl_socket&  ys, nl80211_get_wiphy_req& req)
+nl80211_get_wiphy(ynl_cpp::ynl_socket& ys, nl80211_get_wiphy_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nl80211_get_wiphy_rsp> rsp;
@@ -3102,7 +3102,7 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nl80211_get_wiphy_rsp_list>
-nl80211_get_wiphy_dump(ynl_cpp::ynl_socket&  ys,
+nl80211_get_wiphy_dump(ynl_cpp::ynl_socket& ys,
 		       nl80211_get_wiphy_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3200,7 +3200,7 @@ int nl80211_get_interface_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nl80211_get_interface_rsp>
-nl80211_get_interface(ynl_cpp::ynl_socket&  ys, nl80211_get_interface_req& req)
+nl80211_get_interface(ynl_cpp::ynl_socket& ys, nl80211_get_interface_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<nl80211_get_interface_rsp> rsp;
@@ -3289,7 +3289,7 @@ int nl80211_get_interface_rsp_dump_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nl80211_get_interface_rsp_list>
-nl80211_get_interface_dump(ynl_cpp::ynl_socket&  ys,
+nl80211_get_interface_dump(ynl_cpp::ynl_socket& ys,
 			   nl80211_get_interface_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
@@ -3341,7 +3341,7 @@ int nl80211_get_protocol_features_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<nl80211_get_protocol_features_rsp>
-nl80211_get_protocol_features(ynl_cpp::ynl_socket&  ys,
+nl80211_get_protocol_features(ynl_cpp::ynl_socket& ys,
 			      nl80211_get_protocol_features_req& req)
 {
 	std::unique_ptr<nl80211_get_protocol_features_rsp> rsp;
diff --git a/generated/nl80211-user.hpp b/generated/nl80211-user.hpp
index 3894074..13bcd68 100644
--- a/generated/nl80211-user.hpp
+++ b/generated/nl80211-user.hpp
@@ -296,7 +296,7 @@ in the request.
 
  */
 std::unique_ptr<nl80211_get_wiphy_rsp>
-nl80211_get_wiphy(ynl_cpp::ynl_socket&  ys, nl80211_get_wiphy_req& req);
+nl80211_get_wiphy(ynl_cpp::ynl_socket& ys, nl80211_get_wiphy_req& req);
 
 /* NL80211_CMD_GET_WIPHY - dump */
 struct nl80211_get_wiphy_req_dump {
@@ -366,7 +366,7 @@ struct nl80211_get_wiphy_rsp_list {
 };
 
 std::unique_ptr<nl80211_get_wiphy_rsp_list>
-nl80211_get_wiphy_dump(ynl_cpp::ynl_socket&  ys,
+nl80211_get_wiphy_dump(ynl_cpp::ynl_socket& ys,
 		       nl80211_get_wiphy_req_dump& req);
 
 /* ============== NL80211_CMD_GET_INTERFACE ============== */
@@ -391,7 +391,7 @@ struct nl80211_get_interface_rsp {
  * Get information about an interface or dump a list of all interfaces
  */
 std::unique_ptr<nl80211_get_interface_rsp>
-nl80211_get_interface(ynl_cpp::ynl_socket&  ys, nl80211_get_interface_req& req);
+nl80211_get_interface(ynl_cpp::ynl_socket& ys, nl80211_get_interface_req& req);
 
 /* NL80211_CMD_GET_INTERFACE - dump */
 struct nl80211_get_interface_req_dump {
@@ -415,7 +415,7 @@ struct nl80211_get_interface_rsp_list {
 };
 
 std::unique_ptr<nl80211_get_interface_rsp_list>
-nl80211_get_interface_dump(ynl_cpp::ynl_socket&  ys,
+nl80211_get_interface_dump(ynl_cpp::ynl_socket& ys,
 			   nl80211_get_interface_req_dump& req);
 
 /* ============== NL80211_CMD_GET_PROTOCOL_FEATURES ============== */
@@ -432,7 +432,7 @@ struct nl80211_get_protocol_features_rsp {
  * Get information about supported protocol features
  */
 std::unique_ptr<nl80211_get_protocol_features_rsp>
-nl80211_get_protocol_features(ynl_cpp::ynl_socket&  ys,
+nl80211_get_protocol_features(ynl_cpp::ynl_socket& ys,
 			      nl80211_get_protocol_features_req& req);
 
 } //namespace ynl_cpp
diff --git a/generated/ovpn-user.cpp b/generated/ovpn-user.cpp
index 046ed73..2320e9e 100644
--- a/generated/ovpn-user.cpp
+++ b/generated/ovpn-user.cpp
@@ -570,7 +570,7 @@ int ovpn_keyconf_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested)
 
 /* ============== OVPN_CMD_PEER_NEW ============== */
 /* OVPN_CMD_PEER_NEW - do */
-int ovpn_peer_new(ynl_cpp::ynl_socket&  ys, ovpn_peer_new_req& req)
+int ovpn_peer_new(ynl_cpp::ynl_socket& ys, ovpn_peer_new_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -593,7 +593,7 @@ int ovpn_peer_new(ynl_cpp::ynl_socket&  ys, ovpn_peer_new_req& req)
 
 /* ============== OVPN_CMD_PEER_SET ============== */
 /* OVPN_CMD_PEER_SET - do */
-int ovpn_peer_set(ynl_cpp::ynl_socket&  ys, ovpn_peer_set_req& req)
+int ovpn_peer_set(ynl_cpp::ynl_socket& ys, ovpn_peer_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -644,7 +644,7 @@ int ovpn_peer_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ovpn_peer_get_rsp>
-ovpn_peer_get(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req& req)
+ovpn_peer_get(ynl_cpp::ynl_socket& ys, ovpn_peer_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ovpn_peer_get_rsp> rsp;
@@ -674,7 +674,7 @@ ovpn_peer_get(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req& req)
 
 /* OVPN_CMD_PEER_GET - dump */
 std::unique_ptr<ovpn_peer_get_list>
-ovpn_peer_get_dump(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req_dump& req)
+ovpn_peer_get_dump(ynl_cpp::ynl_socket& ys, ovpn_peer_get_req_dump& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -704,7 +704,7 @@ ovpn_peer_get_dump(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req_dump& req)
 /* OVPN_CMD_PEER_GET - notify */
 /* ============== OVPN_CMD_PEER_DEL ============== */
 /* OVPN_CMD_PEER_DEL - do */
-int ovpn_peer_del(ynl_cpp::ynl_socket&  ys, ovpn_peer_del_req& req)
+int ovpn_peer_del(ynl_cpp::ynl_socket& ys, ovpn_peer_del_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -727,7 +727,7 @@ int ovpn_peer_del(ynl_cpp::ynl_socket&  ys, ovpn_peer_del_req& req)
 
 /* ============== OVPN_CMD_KEY_NEW ============== */
 /* OVPN_CMD_KEY_NEW - do */
-int ovpn_key_new(ynl_cpp::ynl_socket&  ys, ovpn_key_new_req& req)
+int ovpn_key_new(ynl_cpp::ynl_socket& ys, ovpn_key_new_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -778,7 +778,7 @@ int ovpn_key_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<ovpn_key_get_rsp>
-ovpn_key_get(ynl_cpp::ynl_socket&  ys, ovpn_key_get_req& req)
+ovpn_key_get(ynl_cpp::ynl_socket& ys, ovpn_key_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<ovpn_key_get_rsp> rsp;
@@ -809,7 +809,7 @@ ovpn_key_get(ynl_cpp::ynl_socket&  ys, ovpn_key_get_req& req)
 /* OVPN_CMD_KEY_GET - notify */
 /* ============== OVPN_CMD_KEY_SWAP ============== */
 /* OVPN_CMD_KEY_SWAP - do */
-int ovpn_key_swap(ynl_cpp::ynl_socket&  ys, ovpn_key_swap_req& req)
+int ovpn_key_swap(ynl_cpp::ynl_socket& ys, ovpn_key_swap_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
@@ -832,7 +832,7 @@ int ovpn_key_swap(ynl_cpp::ynl_socket&  ys, ovpn_key_swap_req& req)
 
 /* ============== OVPN_CMD_KEY_DEL ============== */
 /* OVPN_CMD_KEY_DEL - do */
-int ovpn_key_del(ynl_cpp::ynl_socket&  ys, ovpn_key_del_req& req)
+int ovpn_key_del(ynl_cpp::ynl_socket& ys, ovpn_key_del_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
diff --git a/generated/ovpn-user.hpp b/generated/ovpn-user.hpp
index e778a96..7d40a2d 100644
--- a/generated/ovpn-user.hpp
+++ b/generated/ovpn-user.hpp
@@ -81,7 +81,7 @@ struct ovpn_peer_new_req {
 /*
  * Add a remote peer
  */
-int ovpn_peer_new(ynl_cpp::ynl_socket&  ys, ovpn_peer_new_req& req);
+int ovpn_peer_new(ynl_cpp::ynl_socket& ys, ovpn_peer_new_req& req);
 
 /* ============== OVPN_CMD_PEER_SET ============== */
 /* OVPN_CMD_PEER_SET - do */
@@ -93,7 +93,7 @@ struct ovpn_peer_set_req {
 /*
  * modify a remote peer
  */
-int ovpn_peer_set(ynl_cpp::ynl_socket&  ys, ovpn_peer_set_req& req);
+int ovpn_peer_set(ynl_cpp::ynl_socket& ys, ovpn_peer_set_req& req);
 
 /* ============== OVPN_CMD_PEER_GET ============== */
 /* OVPN_CMD_PEER_GET - do */
@@ -110,7 +110,7 @@ struct ovpn_peer_get_rsp {
  * Retrieve data about existing remote peers (or a specific one)
  */
 std::unique_ptr<ovpn_peer_get_rsp>
-ovpn_peer_get(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req& req);
+ovpn_peer_get(ynl_cpp::ynl_socket& ys, ovpn_peer_get_req& req);
 
 /* OVPN_CMD_PEER_GET - dump */
 struct ovpn_peer_get_req_dump {
@@ -122,7 +122,7 @@ struct ovpn_peer_get_list {
 };
 
 std::unique_ptr<ovpn_peer_get_list>
-ovpn_peer_get_dump(ynl_cpp::ynl_socket&  ys, ovpn_peer_get_req_dump& req);
+ovpn_peer_get_dump(ynl_cpp::ynl_socket& ys, ovpn_peer_get_req_dump& req);
 
 /* OVPN_CMD_PEER_GET - notify */
 struct ovpn_peer_get_ntf {
@@ -138,7 +138,7 @@ struct ovpn_peer_del_req {
 /*
  * Delete existing remote peer
  */
-int ovpn_peer_del(ynl_cpp::ynl_socket&  ys, ovpn_peer_del_req& req);
+int ovpn_peer_del(ynl_cpp::ynl_socket& ys, ovpn_peer_del_req& req);
 
 /* ============== OVPN_CMD_KEY_NEW ============== */
 /* OVPN_CMD_KEY_NEW - do */
@@ -150,7 +150,7 @@ struct ovpn_key_new_req {
 /*
  * Add a cipher key for a specific peer
  */
-int ovpn_key_new(ynl_cpp::ynl_socket&  ys, ovpn_key_new_req& req);
+int ovpn_key_new(ynl_cpp::ynl_socket& ys, ovpn_key_new_req& req);
 
 /* ============== OVPN_CMD_KEY_GET ============== */
 /* OVPN_CMD_KEY_GET - do */
@@ -167,7 +167,7 @@ struct ovpn_key_get_rsp {
  * Retrieve non-sensitive data about peer key and cipher
  */
 std::unique_ptr<ovpn_key_get_rsp>
-ovpn_key_get(ynl_cpp::ynl_socket&  ys, ovpn_key_get_req& req);
+ovpn_key_get(ynl_cpp::ynl_socket& ys, ovpn_key_get_req& req);
 
 /* OVPN_CMD_KEY_GET - notify */
 struct ovpn_key_get_ntf {
@@ -183,7 +183,7 @@ struct ovpn_key_swap_req {
 /*
  * Swap primary and secondary session keys for a specific peer
  */
-int ovpn_key_swap(ynl_cpp::ynl_socket&  ys, ovpn_key_swap_req& req);
+int ovpn_key_swap(ynl_cpp::ynl_socket& ys, ovpn_key_swap_req& req);
 
 /* ============== OVPN_CMD_KEY_DEL ============== */
 /* OVPN_CMD_KEY_DEL - do */
@@ -195,7 +195,7 @@ struct ovpn_key_del_req {
 /*
  * Delete cipher key for a specific peer
  */
-int ovpn_key_del(ynl_cpp::ynl_socket&  ys, ovpn_key_del_req& req);
+int ovpn_key_del(ynl_cpp::ynl_socket& ys, ovpn_key_del_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_OVPN_GEN_H */
diff --git a/generated/psp-user.cpp b/generated/psp-user.cpp
index 3924985..1072a91 100644
--- a/generated/psp-user.cpp
+++ b/generated/psp-user.cpp
@@ -215,7 +215,7 @@ int psp_dev_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_dev_get_rsp>
-psp_dev_get(ynl_cpp::ynl_socket&  ys, psp_dev_get_req& req)
+psp_dev_get(ynl_cpp::ynl_socket& ys, psp_dev_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_dev_get_rsp> rsp;
@@ -242,7 +242,7 @@ psp_dev_get(ynl_cpp::ynl_socket&  ys, psp_dev_get_req& req)
 }
 
 /* PSP_CMD_DEV_GET - dump */
-std::unique_ptr<psp_dev_get_list> psp_dev_get_dump(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<psp_dev_get_list> psp_dev_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -275,7 +275,7 @@ int psp_dev_set_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_dev_set_rsp>
-psp_dev_set(ynl_cpp::ynl_socket&  ys, psp_dev_set_req& req)
+psp_dev_set(ynl_cpp::ynl_socket& ys, psp_dev_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_dev_set_rsp> rsp;
@@ -327,7 +327,7 @@ int psp_key_rotate_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_key_rotate_rsp>
-psp_key_rotate(ynl_cpp::ynl_socket&  ys, psp_key_rotate_req& req)
+psp_key_rotate(ynl_cpp::ynl_socket& ys, psp_key_rotate_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_key_rotate_rsp> rsp;
@@ -392,7 +392,7 @@ int psp_rx_assoc_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_rx_assoc_rsp>
-psp_rx_assoc(ynl_cpp::ynl_socket&  ys, psp_rx_assoc_req& req)
+psp_rx_assoc(ynl_cpp::ynl_socket& ys, psp_rx_assoc_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_rx_assoc_rsp> rsp;
@@ -431,7 +431,7 @@ int psp_tx_assoc_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_tx_assoc_rsp>
-psp_tx_assoc(ynl_cpp::ynl_socket&  ys, psp_tx_assoc_req& req)
+psp_tx_assoc(ynl_cpp::ynl_socket& ys, psp_tx_assoc_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_tx_assoc_rsp> rsp;
@@ -495,7 +495,7 @@ int psp_get_stats_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<psp_get_stats_rsp>
-psp_get_stats(ynl_cpp::ynl_socket&  ys, psp_get_stats_req& req)
+psp_get_stats(ynl_cpp::ynl_socket& ys, psp_get_stats_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<psp_get_stats_rsp> rsp;
@@ -522,8 +522,7 @@ psp_get_stats(ynl_cpp::ynl_socket&  ys, psp_get_stats_req& req)
 }
 
 /* PSP_CMD_GET_STATS - dump */
-std::unique_ptr<psp_get_stats_list>
-psp_get_stats_dump(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<psp_get_stats_list> psp_get_stats_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
diff --git a/generated/psp-user.hpp b/generated/psp-user.hpp
index acdb0c7..3a41821 100644
--- a/generated/psp-user.hpp
+++ b/generated/psp-user.hpp
@@ -51,14 +51,14 @@ struct psp_dev_get_rsp {
  * Get / dump information about PSP capable devices on the system.
  */
 std::unique_ptr<psp_dev_get_rsp>
-psp_dev_get(ynl_cpp::ynl_socket&  ys, psp_dev_get_req& req);
+psp_dev_get(ynl_cpp::ynl_socket& ys, psp_dev_get_req& req);
 
 /* PSP_CMD_DEV_GET - dump */
 struct psp_dev_get_list {
 	std::list<psp_dev_get_rsp> objs;
 };
 
-std::unique_ptr<psp_dev_get_list> psp_dev_get_dump(ynl_cpp::ynl_socket&  ys);
+std::unique_ptr<psp_dev_get_list> psp_dev_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* PSP_CMD_DEV_GET - notify */
 struct psp_dev_get_ntf {
@@ -78,7 +78,7 @@ struct psp_dev_set_rsp {
  * Set the configuration of a PSP device.
  */
 std::unique_ptr<psp_dev_set_rsp>
-psp_dev_set(ynl_cpp::ynl_socket&  ys, psp_dev_set_req& req);
+psp_dev_set(ynl_cpp::ynl_socket& ys, psp_dev_set_req& req);
 
 /* ============== PSP_CMD_KEY_ROTATE ============== */
 /* PSP_CMD_KEY_ROTATE - do */
@@ -94,7 +94,7 @@ struct psp_key_rotate_rsp {
  * Rotate the device key.
  */
 std::unique_ptr<psp_key_rotate_rsp>
-psp_key_rotate(ynl_cpp::ynl_socket&  ys, psp_key_rotate_req& req);
+psp_key_rotate(ynl_cpp::ynl_socket& ys, psp_key_rotate_req& req);
 
 /* PSP_CMD_KEY_ROTATE - notify */
 struct psp_key_rotate_ntf {
@@ -118,7 +118,7 @@ struct psp_rx_assoc_rsp {
  * Allocate a new Rx key + SPI pair, associate it with a socket.
  */
 std::unique_ptr<psp_rx_assoc_rsp>
-psp_rx_assoc(ynl_cpp::ynl_socket&  ys, psp_rx_assoc_req& req);
+psp_rx_assoc(ynl_cpp::ynl_socket& ys, psp_rx_assoc_req& req);
 
 /* ============== PSP_CMD_TX_ASSOC ============== */
 /* PSP_CMD_TX_ASSOC - do */
@@ -136,7 +136,7 @@ struct psp_tx_assoc_rsp {
  * Add a PSP Tx association.
  */
 std::unique_ptr<psp_tx_assoc_rsp>
-psp_tx_assoc(ynl_cpp::ynl_socket&  ys, psp_tx_assoc_req& req);
+psp_tx_assoc(ynl_cpp::ynl_socket& ys, psp_tx_assoc_req& req);
 
 /* ============== PSP_CMD_GET_STATS ============== */
 /* PSP_CMD_GET_STATS - do */
@@ -154,7 +154,7 @@ struct psp_get_stats_rsp {
  * Get device statistics.
  */
 std::unique_ptr<psp_get_stats_rsp>
-psp_get_stats(ynl_cpp::ynl_socket&  ys, psp_get_stats_req& req);
+psp_get_stats(ynl_cpp::ynl_socket& ys, psp_get_stats_req& req);
 
 /* PSP_CMD_GET_STATS - dump */
 struct psp_get_stats_list {
@@ -162,7 +162,7 @@ struct psp_get_stats_list {
 };
 
 std::unique_ptr<psp_get_stats_list>
-psp_get_stats_dump(ynl_cpp::ynl_socket&  ys);
+psp_get_stats_dump(ynl_cpp::ynl_socket& ys);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_PSP_GEN_H */
diff --git a/generated/rt-addr-user.cpp b/generated/rt-addr-user.cpp
new file mode 100644
index 0000000..a1f1627
--- /dev/null
+++ b/generated/rt-addr-user.cpp
@@ -0,0 +1,347 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
+/* Do not edit directly, auto-generated from: */
+/*	 */
+/* YNL-GEN user source */
+
+#include "rt-addr-user.hpp"
+
+#include <array>
+
+#include <linux/rtnetlink.h>
+
+#include <linux/genetlink.h>
+
+namespace ynl_cpp {
+
+/* Enums */
+static constexpr std::array<std::string_view, RTM_GETMULTICAST + 1> rt_addr_op_strmap = []() {
+	std::array<std::string_view, RTM_GETMULTICAST + 1> arr{};
+	arr[20] = "getaddr";
+	arr[RTM_GETMULTICAST] = "getmulticast";
+	return arr;
+} ();
+
+std::string_view rt_addr_op_str(int op)
+{
+	if (op < 0 || op >= (int)(rt_addr_op_strmap.size()))
+		return "";
+	return rt_addr_op_strmap[op];
+}
+
+static constexpr std::array<std::string_view, 11 + 1> rt_addr_ifa_flags_strmap = []() {
+	std::array<std::string_view, 11 + 1> arr{};
+	arr[0] = "secondary";
+	arr[1] = "nodad";
+	arr[2] = "optimistic";
+	arr[3] = "dadfailed";
+	arr[4] = "homeaddress";
+	arr[5] = "deprecated";
+	arr[6] = "tentative";
+	arr[7] = "permanent";
+	arr[8] = "managetempaddr";
+	arr[9] = "noprefixroute";
+	arr[10] = "mcautojoin";
+	arr[11] = "stable-privacy";
+	return arr;
+} ();
+
+std::string_view rt_addr_ifa_flags_str(int value)
+{
+	value = (int)(ffs(value) - 1);
+	if (value < 0 || value >= (int)(rt_addr_ifa_flags_strmap.size()))
+		return "";
+	return rt_addr_ifa_flags_strmap[value];
+}
+
+/* Policies */
+static std::array<ynl_policy_attr,IFA_MAX + 1> rt_addr_addr_attrs_policy = []() {
+	std::array<ynl_policy_attr,IFA_MAX + 1> arr{};
+	arr[IFA_ADDRESS].name = "address";
+	arr[IFA_ADDRESS].type = YNL_PT_BINARY;
+	arr[IFA_LOCAL].name = "local";
+	arr[IFA_LOCAL].type = YNL_PT_BINARY;
+	arr[IFA_LABEL].name = "label";
+	arr[IFA_LABEL].type  = YNL_PT_NUL_STR;
+	arr[IFA_BROADCAST].name = "broadcast";
+	arr[IFA_BROADCAST].type = YNL_PT_BINARY;
+	arr[IFA_ANYCAST].name = "anycast";
+	arr[IFA_ANYCAST].type = YNL_PT_BINARY;
+	arr[IFA_CACHEINFO].name = "cacheinfo";
+	arr[IFA_CACHEINFO].type = YNL_PT_BINARY;
+	arr[IFA_MULTICAST].name = "multicast";
+	arr[IFA_MULTICAST].type = YNL_PT_BINARY;
+	arr[IFA_FLAGS].name = "flags";
+	arr[IFA_FLAGS].type = YNL_PT_U32;
+	arr[IFA_RT_PRIORITY].name = "rt-priority";
+	arr[IFA_RT_PRIORITY].type = YNL_PT_U32;
+	arr[IFA_TARGET_NETNSID].name = "target-netnsid";
+	arr[IFA_TARGET_NETNSID].type = YNL_PT_BINARY;
+	arr[IFA_PROTO].name = "proto";
+	arr[IFA_PROTO].type = YNL_PT_U8;
+	return arr;
+} ();
+
+struct ynl_policy_nest rt_addr_addr_attrs_nest = {
+	.max_attr = static_cast<unsigned int>(IFA_MAX),
+	.table = rt_addr_addr_attrs_policy.data(),
+};
+
+/* Common nested types */
+/* ============== RTM_NEWADDR ============== */
+/* RTM_NEWADDR - do */
+int rt_addr_newaddr(ynl_cpp::ynl_socket& ys, rt_addr_newaddr_req& req)
+{
+	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
+	struct nlmsghdr *nlh;
+	size_t hdr_len;
+	void *hdr;
+	int err;
+
+	nlh = ynl_msg_start_req(ys, RTM_NEWADDR, req._nlmsg_flags);
+	((struct ynl_sock*)ys)->req_policy = &rt_addr_addr_attrs_nest;
+
+	hdr_len = sizeof(req._hdr);
+	hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);
+	memcpy(hdr, &req._hdr, hdr_len);
+
+	if (req.address.size() > 0)
+		ynl_attr_put(nlh, IFA_ADDRESS, req.address.data(), req.address.size());
+	if (req.label.size() > 0)
+		ynl_attr_put_str(nlh, IFA_LABEL, req.label.data());
+	if (req.local.size() > 0)
+		ynl_attr_put(nlh, IFA_LOCAL, req.local.data(), req.local.size());
+	if (req.cacheinfo.size() > 0)
+		ynl_attr_put(nlh, IFA_CACHEINFO, req.cacheinfo.data(), req.cacheinfo.size());
+
+	err = ynl_exec(ys, nlh, &yrs);
+	if (err < 0)
+		return -1;
+
+	return 0;
+}
+
+/* ============== RTM_DELADDR ============== */
+/* RTM_DELADDR - do */
+int rt_addr_deladdr(ynl_cpp::ynl_socket& ys, rt_addr_deladdr_req& req)
+{
+	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
+	struct nlmsghdr *nlh;
+	size_t hdr_len;
+	void *hdr;
+	int err;
+
+	nlh = ynl_msg_start_req(ys, RTM_DELADDR, req._nlmsg_flags);
+	((struct ynl_sock*)ys)->req_policy = &rt_addr_addr_attrs_nest;
+
+	hdr_len = sizeof(req._hdr);
+	hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);
+	memcpy(hdr, &req._hdr, hdr_len);
+
+	if (req.address.size() > 0)
+		ynl_attr_put(nlh, IFA_ADDRESS, req.address.data(), req.address.size());
+	if (req.local.size() > 0)
+		ynl_attr_put(nlh, IFA_LOCAL, req.local.data(), req.local.size());
+
+	err = ynl_exec(ys, nlh, &yrs);
+	if (err < 0)
+		return -1;
+
+	return 0;
+}
+
+/* ============== RTM_GETADDR ============== */
+/* RTM_GETADDR - dump */
+int rt_addr_getaddr_rsp_dump_parse(const struct nlmsghdr *nlh,
+				   struct ynl_parse_arg *yarg)
+{
+	rt_addr_getaddr_rsp_dump *dst;
+	const struct nlattr *attr;
+	void *hdr;
+
+	dst = (rt_addr_getaddr_rsp_dump*)yarg->data;
+
+	hdr = ynl_nlmsg_data(nlh);
+	memcpy(&dst->_hdr, hdr, sizeof(struct ifaddrmsg));
+
+	ynl_attr_for_each(attr, nlh, yarg->ys->family->hdr_len) {
+		unsigned int type = ynl_attr_type(attr);
+
+		if (type == IFA_ADDRESS) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			unsigned int len = ynl_attr_data_len(attr);
+			__u8 *data = (__u8*)ynl_attr_data(attr);
+			dst->address.assign(data, data + len);
+		} else if (type == IFA_LABEL) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			dst->label.assign(ynl_attr_get_str(attr));
+		} else if (type == IFA_LOCAL) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			unsigned int len = ynl_attr_data_len(attr);
+			__u8 *data = (__u8*)ynl_attr_data(attr);
+			dst->local.assign(data, data + len);
+		} else if (type == IFA_CACHEINFO) {
+			unsigned int len, struct_sz, count;
+
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+
+			len = ynl_attr_data_len(attr);
+			struct_sz = sizeof(struct ifa_cacheinfo);
+			struct ifa_cacheinfo*data = (struct ifa_cacheinfo*)ynl_attr_data(attr);
+			count = (len % struct_sz > 0) ? len / struct_sz + 1 : len / struct_sz;
+			dst->cacheinfo.resize(count);
+			memcpy(dst->cacheinfo.data(), data, len);
+		}
+	}
+
+	return YNL_PARSE_CB_OK;
+}
+
+std::unique_ptr<rt_addr_getaddr_rsp_list>
+rt_addr_getaddr_dump(ynl_cpp::ynl_socket& ys, rt_addr_getaddr_req_dump& req)
+{
+	struct ynl_dump_no_alloc_state yds = {};
+	struct nlmsghdr *nlh;
+	size_t hdr_len;
+	void *hdr;
+	int err;
+
+	auto ret = std::make_unique<rt_addr_getaddr_rsp_list>();
+	yds.yarg.ys = ys;
+	yds.yarg.rsp_policy = &rt_addr_addr_attrs_nest;
+	yds.yarg.data = ret.get();
+	yds.alloc_cb = [](void* arg)->void*{return &(static_cast<rt_addr_getaddr_rsp_list*>(arg)->objs.emplace_back());};
+	yds.cb = rt_addr_getaddr_rsp_dump_parse;
+	yds.rsp_cmd = 20;
+
+	nlh = ynl_msg_start_dump(ys, RTM_GETADDR);
+	hdr_len = sizeof(req._hdr);
+	hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);
+	memcpy(hdr, &req._hdr, hdr_len);
+
+	((struct ynl_sock*)ys)->req_policy = &rt_addr_addr_attrs_nest;
+
+	err = ynl_exec_dump_no_alloc(ys, nlh, &yds);
+	if (err < 0)
+		return nullptr;
+
+	return ret;
+}
+
+/* ============== RTM_GETMULTICAST ============== */
+/* RTM_GETMULTICAST - do */
+int rt_addr_getmulticast_rsp_parse(const struct nlmsghdr *nlh,
+				   struct ynl_parse_arg *yarg)
+{
+	rt_addr_getmulticast_rsp *dst;
+	const struct nlattr *attr;
+	void *hdr;
+
+	dst = (rt_addr_getmulticast_rsp*)yarg->data;
+
+	hdr = ynl_nlmsg_data(nlh);
+	memcpy(&dst->_hdr, hdr, sizeof(struct ifaddrmsg));
+
+	ynl_attr_for_each(attr, nlh, yarg->ys->family->hdr_len) {
+		unsigned int type = ynl_attr_type(attr);
+
+		if (type == IFA_MULTICAST) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			unsigned int len = ynl_attr_data_len(attr);
+			__u8 *data = (__u8*)ynl_attr_data(attr);
+			dst->multicast.assign(data, data + len);
+		} else if (type == IFA_CACHEINFO) {
+			unsigned int len, struct_sz, count;
+
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+
+			len = ynl_attr_data_len(attr);
+			struct_sz = sizeof(struct ifa_cacheinfo);
+			struct ifa_cacheinfo*data = (struct ifa_cacheinfo*)ynl_attr_data(attr);
+			count = (len % struct_sz > 0) ? len / struct_sz + 1 : len / struct_sz;
+			dst->cacheinfo.resize(count);
+			memcpy(dst->cacheinfo.data(), data, len);
+		}
+	}
+
+	return YNL_PARSE_CB_OK;
+}
+
+std::unique_ptr<rt_addr_getmulticast_rsp>
+rt_addr_getmulticast(ynl_cpp::ynl_socket& ys, rt_addr_getmulticast_req& req)
+{
+	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
+	std::unique_ptr<rt_addr_getmulticast_rsp> rsp;
+	struct nlmsghdr *nlh;
+	size_t hdr_len;
+	void *hdr;
+	int err;
+
+	nlh = ynl_msg_start_req(ys, RTM_GETMULTICAST, req._nlmsg_flags);
+	((struct ynl_sock*)ys)->req_policy = &rt_addr_addr_attrs_nest;
+	yrs.yarg.rsp_policy = &rt_addr_addr_attrs_nest;
+
+	hdr_len = sizeof(req._hdr);
+	hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);
+	memcpy(hdr, &req._hdr, hdr_len);
+
+	rsp.reset(new rt_addr_getmulticast_rsp());
+	yrs.yarg.data = rsp.get();
+	yrs.cb = rt_addr_getmulticast_rsp_parse;
+	yrs.rsp_cmd = RTM_GETMULTICAST;
+
+	err = ynl_exec(ys, nlh, &yrs);
+	if (err < 0)
+		return nullptr;
+
+	return rsp;
+}
+
+/* RTM_GETMULTICAST - dump */
+std::unique_ptr<rt_addr_getmulticast_list>
+rt_addr_getmulticast_dump(ynl_cpp::ynl_socket& ys,
+			  rt_addr_getmulticast_req_dump& req)
+{
+	struct ynl_dump_no_alloc_state yds = {};
+	struct nlmsghdr *nlh;
+	size_t hdr_len;
+	void *hdr;
+	int err;
+
+	auto ret = std::make_unique<rt_addr_getmulticast_list>();
+	yds.yarg.ys = ys;
+	yds.yarg.rsp_policy = &rt_addr_addr_attrs_nest;
+	yds.yarg.data = ret.get();
+	yds.alloc_cb = [](void* arg)->void*{return &(static_cast<rt_addr_getmulticast_list*>(arg)->objs.emplace_back());};
+	yds.cb = rt_addr_getmulticast_rsp_parse;
+	yds.rsp_cmd = RTM_GETMULTICAST;
+
+	nlh = ynl_msg_start_dump(ys, RTM_GETMULTICAST);
+	hdr_len = sizeof(req._hdr);
+	hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);
+	memcpy(hdr, &req._hdr, hdr_len);
+
+	((struct ynl_sock*)ys)->req_policy = &rt_addr_addr_attrs_nest;
+
+	err = ynl_exec_dump_no_alloc(ys, nlh, &yds);
+	if (err < 0)
+		return nullptr;
+
+	return ret;
+}
+
+const struct ynl_family ynl_rt_addr_family =  {
+	.name		= "rt_addr",
+	.is_classic	= true,
+	.classic_id	= 0,
+	.hdr_len	= sizeof(struct ifaddrmsg),
+};
+const struct ynl_family& get_ynl_rt_addr_family() {
+	return ynl_rt_addr_family;
+};
+} //namespace ynl_cpp
diff --git a/generated/rt-addr-user.hpp b/generated/rt-addr-user.hpp
new file mode 100644
index 0000000..662ccdd
--- /dev/null
+++ b/generated/rt-addr-user.hpp
@@ -0,0 +1,123 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* Do not edit directly, auto-generated from: */
+/*	 */
+/* YNL-GEN user header */
+
+#ifndef _LINUX_RT_ADDR_GEN_H
+#define _LINUX_RT_ADDR_GEN_H
+
+#include <linux/types.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <list>
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "ynl.hpp"
+
+#include <linux/rtnetlink.h>
+
+namespace ynl_cpp {
+const struct ynl_family& get_ynl_rt_addr_family();
+
+/* Enums */
+std::string_view rt_addr_op_str(int op);
+std::string_view rt_addr_ifa_flags_str(int value);
+
+/* Common nested types */
+/* ============== RTM_NEWADDR ============== */
+/* RTM_NEWADDR - do */
+struct rt_addr_newaddr_req {
+	__u16 _nlmsg_flags;
+
+	struct ifaddrmsg _hdr;
+
+	std::vector<__u8> address;
+	std::string label;
+	std::vector<__u8> local;
+	std::vector<struct ifa_cacheinfo> cacheinfo;
+};
+
+/*
+ * Add new address
+ */
+int rt_addr_newaddr(ynl_cpp::ynl_socket& ys, rt_addr_newaddr_req& req);
+
+/* ============== RTM_DELADDR ============== */
+/* RTM_DELADDR - do */
+struct rt_addr_deladdr_req {
+	__u16 _nlmsg_flags;
+
+	struct ifaddrmsg _hdr;
+
+	std::vector<__u8> address;
+	std::vector<__u8> local;
+};
+
+/*
+ * Remove address
+ */
+int rt_addr_deladdr(ynl_cpp::ynl_socket& ys, rt_addr_deladdr_req& req);
+
+/* ============== RTM_GETADDR ============== */
+/* RTM_GETADDR - dump */
+struct rt_addr_getaddr_req_dump {
+	struct ifaddrmsg _hdr;
+};
+
+struct rt_addr_getaddr_rsp_dump {
+	struct ifaddrmsg _hdr;
+
+	std::vector<__u8> address;
+	std::string label;
+	std::vector<__u8> local;
+	std::vector<struct ifa_cacheinfo> cacheinfo;
+};
+
+struct rt_addr_getaddr_rsp_list {
+	std::list<rt_addr_getaddr_rsp_dump> objs;
+};
+
+std::unique_ptr<rt_addr_getaddr_rsp_list>
+rt_addr_getaddr_dump(ynl_cpp::ynl_socket& ys, rt_addr_getaddr_req_dump& req);
+
+/* ============== RTM_GETMULTICAST ============== */
+/* RTM_GETMULTICAST - do */
+struct rt_addr_getmulticast_req {
+	__u16 _nlmsg_flags;
+
+	struct ifaddrmsg _hdr;
+};
+
+struct rt_addr_getmulticast_rsp {
+	struct ifaddrmsg _hdr;
+
+	std::vector<__u8> multicast;
+	std::vector<struct ifa_cacheinfo> cacheinfo;
+};
+
+/*
+ * Get / dump IPv4/IPv6 multicast addresses.
+ */
+std::unique_ptr<rt_addr_getmulticast_rsp>
+rt_addr_getmulticast(ynl_cpp::ynl_socket& ys, rt_addr_getmulticast_req& req);
+
+/* RTM_GETMULTICAST - dump */
+struct rt_addr_getmulticast_req_dump {
+	struct ifaddrmsg _hdr;
+};
+
+struct rt_addr_getmulticast_list {
+	std::list<rt_addr_getmulticast_rsp> objs;
+};
+
+std::unique_ptr<rt_addr_getmulticast_list>
+rt_addr_getmulticast_dump(ynl_cpp::ynl_socket& ys,
+			  rt_addr_getmulticast_req_dump& req);
+
+} //namespace ynl_cpp
+#endif /* _LINUX_RT_ADDR_GEN_H */
diff --git a/generated/tcp_metrics-user.cpp b/generated/tcp_metrics-user.cpp
index 3499dbb..fa1b9ac 100644
--- a/generated/tcp_metrics-user.cpp
+++ b/generated/tcp_metrics-user.cpp
@@ -206,7 +206,7 @@ int tcp_metrics_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<tcp_metrics_get_rsp>
-tcp_metrics_get(ynl_cpp::ynl_socket&  ys, tcp_metrics_get_req& req)
+tcp_metrics_get(ynl_cpp::ynl_socket& ys, tcp_metrics_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<tcp_metrics_get_rsp> rsp;
@@ -240,7 +240,7 @@ tcp_metrics_get(ynl_cpp::ynl_socket&  ys, tcp_metrics_get_req& req)
 
 /* TCP_METRICS_CMD_GET - dump */
 std::unique_ptr<tcp_metrics_get_list>
-tcp_metrics_get_dump(ynl_cpp::ynl_socket&  ys)
+tcp_metrics_get_dump(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
@@ -265,7 +265,7 @@ tcp_metrics_get_dump(ynl_cpp::ynl_socket&  ys)
 
 /* ============== TCP_METRICS_CMD_DEL ============== */
 /* TCP_METRICS_CMD_DEL - do */
-int tcp_metrics_del(ynl_cpp::ynl_socket&  ys, tcp_metrics_del_req& req)
+int tcp_metrics_del(ynl_cpp::ynl_socket& ys, tcp_metrics_del_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	struct nlmsghdr *nlh;
diff --git a/generated/tcp_metrics-user.hpp b/generated/tcp_metrics-user.hpp
index 8ff8672..d1c0295 100644
--- a/generated/tcp_metrics-user.hpp
+++ b/generated/tcp_metrics-user.hpp
@@ -64,7 +64,7 @@ struct tcp_metrics_get_rsp {
  * Retrieve metrics.
  */
 std::unique_ptr<tcp_metrics_get_rsp>
-tcp_metrics_get(ynl_cpp::ynl_socket&  ys, tcp_metrics_get_req& req);
+tcp_metrics_get(ynl_cpp::ynl_socket& ys, tcp_metrics_get_req& req);
 
 /* TCP_METRICS_CMD_GET - dump */
 struct tcp_metrics_get_list {
@@ -72,7 +72,7 @@ struct tcp_metrics_get_list {
 };
 
 std::unique_ptr<tcp_metrics_get_list>
-tcp_metrics_get_dump(ynl_cpp::ynl_socket&  ys);
+tcp_metrics_get_dump(ynl_cpp::ynl_socket& ys);
 
 /* ============== TCP_METRICS_CMD_DEL ============== */
 /* TCP_METRICS_CMD_DEL - do */
@@ -86,7 +86,7 @@ struct tcp_metrics_del_req {
 /*
  * Delete metrics.
  */
-int tcp_metrics_del(ynl_cpp::ynl_socket&  ys, tcp_metrics_del_req& req);
+int tcp_metrics_del(ynl_cpp::ynl_socket& ys, tcp_metrics_del_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_TCP_METRICS_GEN_H */
diff --git a/generated/team-user.cpp b/generated/team-user.cpp
index 3ce0c3f..aebaf00 100644
--- a/generated/team-user.cpp
+++ b/generated/team-user.cpp
@@ -322,7 +322,7 @@ int team_noop_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg)
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<team_noop_rsp> team_noop(ynl_cpp::ynl_socket&  ys)
+std::unique_ptr<team_noop_rsp> team_noop(ynl_cpp::ynl_socket& ys)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<team_noop_rsp> rsp;
@@ -379,7 +379,7 @@ int team_options_set_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<team_options_set_rsp>
-team_options_set(ynl_cpp::ynl_socket&  ys, team_options_set_req& req)
+team_options_set(ynl_cpp::ynl_socket& ys, team_options_set_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<team_options_set_rsp> rsp;
@@ -441,7 +441,7 @@ int team_options_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<team_options_get_rsp>
-team_options_get(ynl_cpp::ynl_socket&  ys, team_options_get_req& req)
+team_options_get(ynl_cpp::ynl_socket& ys, team_options_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<team_options_get_rsp> rsp;
@@ -501,7 +501,7 @@ int team_port_list_get_rsp_parse(const struct nlmsghdr *nlh,
 }
 
 std::unique_ptr<team_port_list_get_rsp>
-team_port_list_get(ynl_cpp::ynl_socket&  ys, team_port_list_get_req& req)
+team_port_list_get(ynl_cpp::ynl_socket& ys, team_port_list_get_req& req)
 {
 	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
 	std::unique_ptr<team_port_list_get_rsp> rsp;
diff --git a/generated/team-user.hpp b/generated/team-user.hpp
index da37d9a..c0d4379 100644
--- a/generated/team-user.hpp
+++ b/generated/team-user.hpp
@@ -65,7 +65,7 @@ struct team_noop_rsp {
 /*
  * No operation
  */
-std::unique_ptr<team_noop_rsp> team_noop(ynl_cpp::ynl_socket&  ys);
+std::unique_ptr<team_noop_rsp> team_noop(ynl_cpp::ynl_socket& ys);
 
 /* ============== TEAM_CMD_OPTIONS_SET ============== */
 /* TEAM_CMD_OPTIONS_SET - do */
@@ -83,7 +83,7 @@ struct team_options_set_rsp {
  * Set team options
  */
 std::unique_ptr<team_options_set_rsp>
-team_options_set(ynl_cpp::ynl_socket&  ys, team_options_set_req& req);
+team_options_set(ynl_cpp::ynl_socket& ys, team_options_set_req& req);
 
 /* ============== TEAM_CMD_OPTIONS_GET ============== */
 /* TEAM_CMD_OPTIONS_GET - do */
@@ -100,7 +100,7 @@ struct team_options_get_rsp {
  * Get team options info
  */
 std::unique_ptr<team_options_get_rsp>
-team_options_get(ynl_cpp::ynl_socket&  ys, team_options_get_req& req);
+team_options_get(ynl_cpp::ynl_socket& ys, team_options_get_req& req);
 
 /* ============== TEAM_CMD_PORT_LIST_GET ============== */
 /* TEAM_CMD_PORT_LIST_GET - do */
@@ -117,7 +117,7 @@ struct team_port_list_get_rsp {
  * Get team ports info
  */
 std::unique_ptr<team_port_list_get_rsp>
-team_port_list_get(ynl_cpp::ynl_socket&  ys, team_port_list_get_req& req);
+team_port_list_get(ynl_cpp::ynl_socket& ys, team_port_list_get_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_TEAM_GEN_H */
diff --git a/lib/ynl-priv.h b/lib/ynl-priv.h
index 73571eb..9e4dd45 100644
--- a/lib/ynl-priv.h
+++ b/lib/ynl-priv.h
@@ -94,6 +94,9 @@ struct ynl_ntf_base_type {
   unsigned char data[] __attribute__((aligned(8)));
 };
 
+struct nlmsghdr *ynl_msg_start_req(struct ynl_sock *ys, __u32 id, __u16 flags);
+struct nlmsghdr *ynl_msg_start_dump(struct ynl_sock *ys, __u32 id);
+
 struct nlmsghdr*
 ynl_gemsg_start_req(struct ynl_sock* ys, __u32 id, __u8 cmd, __u8 version);
 struct nlmsghdr*
diff --git a/lib/ynl.c b/lib/ynl.c
index cb1adb9..f2ce46e 100644
--- a/lib/ynl.c
+++ b/lib/ynl.c
@@ -522,12 +522,12 @@ struct nlmsghdr* ynl_gemsg_start(
   return nlh;
 }
 
-void ynl_msg_start_req(struct ynl_sock* ys, __u32 id) {
-  ynl_msg_start(ys, id, NLM_F_REQUEST | NLM_F_ACK);
+struct nlmsghdr *ynl_msg_start_req(struct ynl_sock* ys, __u32 id, __u16 flags) {
+  return ynl_msg_start(ys, id, NLM_F_REQUEST | NLM_F_ACK | flags);
 }
 
-void ynl_msg_start_dump(struct ynl_sock* ys, __u32 id) {
-  ynl_msg_start(ys, id, NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
+struct nlmsghdr *ynl_msg_start_dump(struct ynl_sock* ys, __u32 id) {
+  return ynl_msg_start(ys, id, NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
 }
 
 struct nlmsghdr*
@@ -732,6 +732,7 @@ struct ynl_sock* ynl_sock_create(
     struct ynl_error* yse) {
   struct sockaddr_nl addr;
   struct ynl_sock* ys;
+  int sock_type;
   socklen_t addrlen;
   int one = 1;
 
@@ -745,7 +746,9 @@ struct ynl_sock* ynl_sock_create(
   ys->rx_buf = &ys->raw_buf[YNL_SOCKET_BUFFER_SIZE];
   ys->ntf_last_next = &ys->ntf_first;
 
-  ys->socket = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);
+  sock_type = yf->is_classic ? yf->classic_id : NETLINK_GENERIC;
+
+  ys->socket = socket(AF_NETLINK, SOCK_RAW, sock_type);
   if (ys->socket < 0) {
     __perr(yse, "failed to create a netlink socket");
     goto err_free_sock;
@@ -778,7 +781,9 @@ struct ynl_sock* ynl_sock_create(
   ys->portid = addr.nl_pid;
   ys->seq = random();
 
-  if (ynl_sock_read_family(ys, yf->name)) {
+  if (yf->is_classic) {
+		ys->family_id = yf->classic_id;
+	} else if (ynl_sock_read_family(ys, yf->name)) {
     if (yse)
       memcpy(yse, &ys->err, sizeof(*yse));
     goto err_close_sock;
@@ -930,17 +935,21 @@ static int ynl_check_alien(
     struct ynl_sock* ys,
     const struct nlmsghdr* nlh,
     __u32 rsp_cmd) {
-  struct genlmsghdr* gehdr;
+  if (ys->family->is_classic) {
+    if (nlh->nlmsg_type != rsp_cmd)
+      return ynl_ntf_parse(ys, nlh);
+  } else {
+    struct genlmsghdr* gehdr;
+
+    if (ynl_nlmsg_data_len(nlh) < sizeof(*gehdr)) {
+      yerr(ys, YNL_ERROR_INV_RESP, "Kernel responded with truncated message");
+      return -1;
+    }
 
-  if (ynl_nlmsg_data_len(nlh) < sizeof(*gehdr)) {
-    yerr(ys, YNL_ERROR_INV_RESP, "Kernel responded with truncated message");
-    return -1;
+    gehdr = ynl_nlmsg_data(nlh);
+    if (gehdr->cmd != rsp_cmd)
+      return ynl_ntf_parse(ys, nlh);
   }
-
-  gehdr = ynl_nlmsg_data(nlh);
-  if (gehdr->cmd != rsp_cmd)
-    return ynl_ntf_parse(ys, nlh);
-
   return 0;
 }
 
diff --git a/lib/ynl.h b/lib/ynl.h
index 601350e..0666724 100644
--- a/lib/ynl.h
+++ b/lib/ynl.h
@@ -47,6 +47,8 @@ struct ynl_error {
 struct ynl_family {
   /* private: */
   const char* name;
+  bool is_classic;
+  __u16 classic_id;
   size_t hdr_len;
   const struct ynl_ntf_info* ntf_info;
   unsigned int ntf_info_size;
diff --git a/samples/.gitignore b/samples/.gitignore
index b4f8b18..f94ff51 100644
--- a/samples/.gitignore
+++ b/samples/.gitignore
@@ -1,2 +1,3 @@
 ethtool
 netdev
+rt-addr
diff --git a/samples/rt-addr.cpp b/samples/rt-addr.cpp
new file mode 100644
index 0000000..95ac453
--- /dev/null
+++ b/samples/rt-addr.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <arpa/inet.h>
+#include <iomanip>
+#include <iostream>
+#include <net/if.h>
+#include <rt-addr-user.hpp>
+#include <sys/socket.h>
+#include <ynl.hpp>
+
+std::ostream &operator<<(std::ostream &os,
+                         const ynl_cpp::rt_addr_getaddr_rsp_dump &rsp) {
+  char buf[IF_NAMESIZE];
+  char addr_str[64];
+
+  auto name = if_indextoname(rsp._hdr.ifa_index, buf);
+  if (name)
+    os << std::setw(16) << name << ": ";
+
+  if (rsp.address.size() == 4) {
+    os << inet_ntop(AF_INET, rsp.address.data(), addr_str, sizeof(addr_str));
+  } else if (rsp.address.size() == 16) {
+    os << inet_ntop(AF_INET6, rsp.address.data(), addr_str, sizeof(addr_str));
+  } else {
+    os << "[" << rsp.address.size() << "]";
+  }
+
+  return os;
+}
+
+int main(int argc, char **argv) {
+  ynl_error yerr;
+  ynl_cpp::ynl_socket ys(ynl_cpp::get_ynl_rt_addr_family(), &yerr);
+  if (!ys) {
+    std::cerr << yerr.msg << std::endl;
+    return -1;
+  }
+
+  ynl_cpp::rt_addr_getaddr_req_dump req = {};
+  std::unique_ptr<ynl_cpp::rt_addr_getaddr_rsp_list> rsp =
+      ynl_cpp::rt_addr_getaddr_dump(ys, req);
+  if (rsp == nullptr) {
+    std::cerr << "Error: rt-addr getaddr dump fails" << std::endl;
+    return 2;
+  }
+  if (rsp->objs.empty()) {
+    std::cerr << "Error: no addresses reported" << std::endl;
+    return 2;
+  }
+
+  for (const auto &addr : rsp->objs)
+    std::cout << addr << std::endl;
+
+  return 0;
+}
diff --git a/ynl-gen-cpp.py b/ynl-gen-cpp.py
index cd52496..b23c469 100755
--- a/ynl-gen-cpp.py
+++ b/ynl-gen-cpp.py
@@ -79,7 +79,7 @@ def __init__(self, family, attr_set, attr, value):
         if self.c_name in _C_KW:
             self.c_name += "_"
         if self.c_name[0].isdigit():
-            self.c_name = '_' + self.c_name
+            self.c_name = "_" + self.c_name
 
         # Added by resolve():
         self.enum_name = None
@@ -286,33 +286,34 @@ def __init__(self, family, attr_set, attr, value):
         if "byte-order" in attr:
             self.byte_order_comment = f" /* {attr['byte-order']} */"
 
-        if "enum" in self.attr:
-            enum = self.family.consts[self.attr["enum"]]
-            low, high = enum.value_range()
-            if low == None and high == None:
-                self.checks['sparse'] = True
-            else:
-                if "min" not in self.checks:
-                    if low != 0 or self.type[0] == "s":
-                        self.checks["min"] = low
-                if "max" not in self.checks:
-                    self.checks["max"] = high
-
-        if "min" in self.checks and "max" in self.checks:
-            if self.get_limit("min") > self.get_limit("max"):
+        if not family.is_classic():
+            if "enum" in self.attr:
+                enum = self.family.consts[self.attr["enum"]]
+                low, high = enum.value_range()
+                if low == None and high == None:
+                    self.checks["sparse"] = True
+                else:
+                    if "min" not in self.checks:
+                        if low != 0 or self.type[0] == "s":
+                            self.checks["min"] = low
+                    if "max" not in self.checks:
+                        self.checks["max"] = high
+
+            if "min" in self.checks and "max" in self.checks:
+                if self.get_limit("min") > self.get_limit("max"):
+                    raise Exception(
+                        f'Invalid limit for "{self.name}" min: {self.get_limit("min")} max: {self.get_limit("max")}'
+                    )
+                self.checks["range"] = True
+
+            low = min(self.get_limit("min", 0), self.get_limit("max", 0))
+            high = max(self.get_limit("min", 0), self.get_limit("max", 0))
+            if low < 0 and self.type[0] == "u":
                 raise Exception(
-                    f'Invalid limit for "{self.name}" min: {self.get_limit("min")} max: {self.get_limit("max")}'
+                    f'Invalid limit for "{self.name}" negative limit for unsigned type'
                 )
-            self.checks["range"] = True
-
-        low = min(self.get_limit("min", 0), self.get_limit("max", 0))
-        high = max(self.get_limit("min", 0), self.get_limit("max", 0))
-        if low < 0 and self.type[0] == "u":
-            raise Exception(
-                f'Invalid limit for "{self.name}" negative limit for unsigned type'
-            )
-        if low < -32768 or high > 32767:
-            self.checks["full-range"] = True
+            if low < -32768 or high > 32767:
+                self.checks["full-range"] = True
 
         # Added by resolve():
         self.is_bitfield = None
@@ -513,6 +514,25 @@ def _setter_lines(self, ri, member, presence):
         ]
 
 
+class TypeBinaryStruct(TypeBinary):
+    def struct_member(self, ri):
+        ri.cw.p(f'std::vector<struct {c_lower(self.get("struct"))}> {self.c_name};')
+
+    def _attr_get(self, ri, var):
+        struct_sz = "sizeof(struct " + c_lower(self.get("struct")) + ")"
+        return (
+            [
+                f"struct_sz = {struct_sz};",
+                f'struct {c_lower(self.get("struct"))}*data = (struct {c_lower(self.get("struct"))}*)ynl_attr_data(attr);',
+                f"count = (len % struct_sz > 0) ? len / struct_sz + 1 : len / struct_sz;",
+                f"{var}->{self.c_name}.resize(count);",
+                f"memcpy({var}->{self.c_name}.data(), data, len);",
+            ],
+            ["len = ynl_attr_data_len(attr);"],
+            ["unsigned int len, struct_sz, count;"],
+        )
+
+
 class TypeBitfield32(Type):
     def _complex_member_type(self, ri):
         return "struct nla_bitfield32"
@@ -867,7 +887,10 @@ def new_attr(self, elem, value):
         elif elem["type"] == "string":
             t = TypeString(self.family, self, elem, value)
         elif elem["type"] == "binary":
-            t = TypeBinary(self.family, self, elem, value)
+            if "struct" in elem:
+                t = TypeBinaryStruct(self.family, self, elem, value)
+            else:
+                t = TypeBinary(self.family, self, elem, value)
         elif elem["type"] == "bitfield32":
             t = TypeBitfield32(self.family, self, elem, value)
         elif elem["type"] == "nest":
@@ -956,13 +979,6 @@ def __init__(self, file_name, exclude_ops):
     def resolve(self):
         self.resolve_up(super())
 
-        if self.yaml.get("protocol", "genetlink") not in {
-            "genetlink",
-            "genetlink-c",
-            "genetlink-legacy",
-        }:
-            raise Exception("Codegen only supported for genetlink")
-
         self.c_name = c_lower(self.name)
         if "name-prefix" in self.yaml["operations"]:
             self.op_prefix = c_upper(self.yaml["operations"]["name-prefix"])
@@ -1009,6 +1025,9 @@ def new_attr_set(self, elem):
     def new_operation(self, elem, req_value, rsp_value):
         return Operation(self, elem, req_value, rsp_value)
 
+    def is_classic(self):
+        return self.proto == "netlink-raw"
+
     def _mark_notify(self):
         for op in self.msgs.values():
             if "notify" in op:
@@ -1200,7 +1219,8 @@ def __init__(self, cw, family, ku_space, op, op_mode, attr_set=None):
         self.op_mode = op_mode
         self.op = op
 
-        self.fixed_hdr = None
+        self.fixed_hdr = op.fixed_header if op else None
+        self.fixed_hdr_len = "ys->family->hdr_len"
         if op and op.fixed_header:
             self.fixed_hdr = "struct " + c_lower(op.fixed_header)
 
@@ -1243,6 +1263,11 @@ def __init__(self, cw, family, ku_space, op, op_mode, attr_set=None):
                 family, self.attr_set, type_list=op["event"]["attributes"]
             )
 
+    def needs_nlflags(self, direction):
+        return (
+            self.op_mode == "do" and direction == "request" and self.family.is_classic()
+        )
+
 
 class CodeWriter:
     def __init__(self, nlib, out_file=None, overwrite=True):
@@ -1532,7 +1557,7 @@ def print_prototype(ri, direction, terminate=True, doc=None):
     if ri.op_mode == "dump":
         fname += "_dump"
 
-    args = ["ynl_cpp::ynl_socket&  ys"]
+    args = ["ynl_cpp::ynl_socket& ys"]
     if "request" in ri.op[ri.op_mode]:
         args.append(
             f"{type_name(ri, direction)}& " + f"{direction_to_suffix[direction][1:]}"
@@ -1734,7 +1759,12 @@ def _multi_parse(ri, struct, init_lines, local_vars):
         ri.cw.p(f"dst->{arg} = {arg};")
 
     if ri.fixed_hdr:
-        ri.cw.p("hdr = ynl_nlmsg_data_offset(nlh, sizeof(struct genlmsghdr));")
+        if struct.nested:
+            ri.cw.p("hdr = ynl_attr_data(nested);")
+        elif ri.family.is_classic():
+            ri.cw.p("hdr = ynl_nlmsg_data(nlh);")
+        else:
+            ri.cw.p("hdr = ynl_nlmsg_data_offset(nlh, sizeof(struct genlmsghdr));")
         ri.cw.p(f"memcpy(&dst->_hdr, hdr, sizeof({ri.fixed_hdr}));")
     for anest in sorted(all_multi):
         aspec = struct[anest]
@@ -1884,9 +1914,12 @@ def print_req(ri):
     ri.cw.block_start()
     ri.cw.write_func_lvar(local_vars)
 
-    ri.cw.p(
-        f"nlh = ynl_gemsg_start_req(ys, {ri.nl.get_family_id()}, {ri.op.enum_name}, 1);"
-    )
+    if ri.family.is_classic():
+        ri.cw.p(f"nlh = ynl_msg_start_req(ys, {ri.op.enum_name}, req._nlmsg_flags);")
+    else:
+        ri.cw.p(
+            f"nlh = ynl_gemsg_start_req(ys, {ri.nl.get_family_id()}, {ri.op.enum_name}, 1);"
+        )
 
     ri.cw.p(
         f"((struct ynl_sock*)ys)->req_policy = &{ri.struct['request'].render_name}_nest;"
@@ -1896,9 +1929,9 @@ def print_req(ri):
     ri.cw.nl()
 
     if ri.fixed_hdr:
-        ri.cw.p("hdr_len = sizeof(req->_hdr);")
+        ri.cw.p("hdr_len = sizeof(req._hdr);")
         ri.cw.p("hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);")
-        ri.cw.p("memcpy(hdr, &req->_hdr, hdr_len);")
+        ri.cw.p("memcpy(hdr, &req._hdr, hdr_len);")
         ri.cw.nl()
 
     for _, attr in ri.struct["request"].member_list():
@@ -1958,14 +1991,17 @@ def print_dump(ri):
     else:
         ri.cw.p(f"yds.rsp_cmd = {ri.op.rsp_value};")
     ri.cw.nl()
-    ri.cw.p(
-        f"nlh = ynl_gemsg_start_dump(ys, {ri.nl.get_family_id()}, {ri.op.enum_name}, 1);"
-    )
+    if ri.family.is_classic():
+        ri.cw.p(f"nlh = ynl_msg_start_dump(ys, {ri.op.enum_name});")
+    else:
+        ri.cw.p(
+            f"nlh = ynl_gemsg_start_dump(ys, {ri.nl.get_family_id()}, {ri.op.enum_name}, 1);"
+        )
 
     if ri.fixed_hdr:
-        ri.cw.p("hdr_len = sizeof(req->_hdr);")
+        ri.cw.p("hdr_len = sizeof(req._hdr);")
         ri.cw.p("hdr = ynl_nlmsg_put_extra_header(nlh, hdr_len);")
-        ri.cw.p("memcpy(hdr, &req->_hdr, hdr_len);")
+        ri.cw.p("memcpy(hdr, &req._hdr, hdr_len);")
         ri.cw.nl()
 
     if "request" in ri.op[ri.op_mode]:
@@ -1997,6 +2033,9 @@ def _print_type(ri, direction, struct):
 
     ri.cw.block_start(line=f"struct {ri.family.c_name}{suffix}")
 
+    if ri.needs_nlflags(direction):
+        ri.cw.p("__u16 _nlmsg_flags;")
+        ri.cw.nl()
     if ri.fixed_hdr:
         ri.cw.p(ri.fixed_hdr + " _hdr;")
         ri.cw.nl()
@@ -2032,7 +2071,7 @@ def print_parse_prototype(ri, direction, terminate=True):
 
 
 def print_req_type(ri):
-    if len(ri.struct["request"].attr_list) == 0:
+    if len(ri.struct["request"].attr_list) == 0 and ri.op.fixed_header is None:
         return
     print_type(ri, "request")
 
@@ -2142,7 +2181,13 @@ def render_user_family(family, cw, prototype):
 
     cw.block_start(f"{symbol} = ")
     cw.p(f'.name\t\t= "{family.c_name}",')
-    if family.fixed_header:
+    if family.is_classic():
+        cw.p(f".is_classic\t= true,")
+        cw.p(f'.classic_id\t= {family.get("protonum")},')
+    if family.is_classic():
+        if family.fixed_header:
+            cw.p(f".hdr_len\t= sizeof(struct {c_lower(family.fixed_header)}),")
+    elif family.fixed_header:
         cw.p(
             f".hdr_len\t= sizeof(struct genlmsghdr) + sizeof(struct {c_lower(family.fixed_header)}),"
         )