Skip to content

Commit 8447070

Browse files
committed
Also fix duplicate #include headers in ethtool-user.cpp. And regenerate all code.
1 parent 689d045 commit 8447070

File tree

11 files changed

+144
-154
lines changed

11 files changed

+144
-154
lines changed

generated/ethtool-user.cpp

Lines changed: 83 additions & 88 deletions
Large diffs are not rendered by default.

generated/ethtool-user.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919

2020
#include "ynl.hpp"
2121

22-
#include <linux/ethtool_netlink_generated.h>
23-
#include <linux/ethtool.h>
24-
#include <linux/ethtool.h>
25-
#include <linux/ethtool.h>
26-
#include <linux/ethtool.h>
27-
#include <linux/ethtool.h>
2822
#include <linux/ethtool.h>
23+
#include <linux/ethtool_netlink_generated.h>
2924

3025
namespace ynl_cpp {
3126
const struct ynl_family& get_ynl_ethtool_family();

generated/mptcp_pm-user.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ int mptcp_pm_get_addr_rsp_parse(const struct nlmsghdr *nlh,
259259
return YNL_PARSE_CB_ERROR;
260260

261261
parg.rsp_policy = &mptcp_pm_address_nest;
262-
parg.data = &dst->addr;
262+
parg.data = &dst->addr.emplace();
263263
if (mptcp_pm_address_parse(&parg, attr))
264264
return YNL_PARSE_CB_ERROR;
265265
}

generated/net_shaper-user.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@ int net_shaper_get_rsp_parse(const struct nlmsghdr *nlh,
236236
return YNL_PARSE_CB_ERROR;
237237

238238
parg.rsp_policy = &net_shaper_handle_nest;
239-
parg.data = &dst->parent;
239+
parg.data = &dst->parent.emplace();
240240
if (net_shaper_handle_parse(&parg, attr))
241241
return YNL_PARSE_CB_ERROR;
242242
} else if (type == NET_SHAPER_A_HANDLE) {
243243
if (ynl_attr_validate(yarg, attr))
244244
return YNL_PARSE_CB_ERROR;
245245

246246
parg.rsp_policy = &net_shaper_handle_nest;
247-
parg.data = &dst->handle;
247+
parg.data = &dst->handle.emplace();
248248
if (net_shaper_handle_parse(&parg, attr))
249249
return YNL_PARSE_CB_ERROR;
250250
} else if (type == NET_SHAPER_A_METRIC) {
@@ -417,7 +417,7 @@ int net_shaper_group_rsp_parse(const struct nlmsghdr *nlh,
417417
return YNL_PARSE_CB_ERROR;
418418

419419
parg.rsp_policy = &net_shaper_handle_nest;
420-
parg.data = &dst->handle;
420+
parg.data = &dst->handle.emplace();
421421
if (net_shaper_handle_parse(&parg, attr))
422422
return YNL_PARSE_CB_ERROR;
423423
}

generated/netdev-user.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ int netdev_page_pool_get_rsp_parse(const struct nlmsghdr *nlh,
631631
return YNL_PARSE_CB_ERROR;
632632

633633
parg.rsp_policy = &netdev_io_uring_provider_info_nest;
634-
parg.data = &dst->io_uring;
634+
parg.data = &dst->io_uring.emplace();
635635
if (netdev_io_uring_provider_info_parse(&parg, attr))
636636
return YNL_PARSE_CB_ERROR;
637637
}
@@ -713,7 +713,7 @@ int netdev_page_pool_stats_get_rsp_parse(const struct nlmsghdr *nlh,
713713
return YNL_PARSE_CB_ERROR;
714714

715715
parg.rsp_policy = &netdev_page_pool_info_nest;
716-
parg.data = &dst->info;
716+
parg.data = &dst->info.emplace();
717717
if (netdev_page_pool_info_parse(&parg, attr))
718718
return YNL_PARSE_CB_ERROR;
719719
} else if (type == NETDEV_A_PAGE_POOL_STATS_ALLOC_FAST) {
@@ -859,15 +859,15 @@ int netdev_queue_get_rsp_parse(const struct nlmsghdr *nlh,
859859
return YNL_PARSE_CB_ERROR;
860860

861861
parg.rsp_policy = &netdev_io_uring_provider_info_nest;
862-
parg.data = &dst->io_uring;
862+
parg.data = &dst->io_uring.emplace();
863863
if (netdev_io_uring_provider_info_parse(&parg, attr))
864864
return YNL_PARSE_CB_ERROR;
865865
} else if (type == NETDEV_A_QUEUE_XSK) {
866866
if (ynl_attr_validate(yarg, attr))
867867
return YNL_PARSE_CB_ERROR;
868868

869869
parg.rsp_policy = &netdev_xsk_info_nest;
870-
parg.data = &dst->xsk;
870+
parg.data = &dst->xsk.emplace();
871871
if (netdev_xsk_info_parse(&parg, attr))
872872
return YNL_PARSE_CB_ERROR;
873873
}

0 commit comments

Comments
 (0)