[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230510-dcb-rewr-v1-2-83adc1f93356@microchip.com>
Date: Mon, 22 May 2023 20:41:05 +0200
From: Daniel Machon <daniel.machon@...rochip.com>
To: <netdev@...r.kernel.org>
CC: <dsahern@...nel.org>, <stephen@...workplumber.org>, <petrm@...dia.com>,
<UNGLinuxDriver@...rochip.com>, <daniel.machon@...rochip.com>
Subject: [PATCH iproute2-next 2/9] dcb: app: add new dcbnl attribute field
Add a new field 'attr' to the dcb_app_table struct, in order to inject
different dcbnl get/set attributes for APP and rewrite. This is required
later, when a number of the existing dcb-app functions are refactored
for reuse by dcb-rewr.
Signed-off-by: Daniel Machon <daniel.machon@...rochip.com>
---
dcb/dcb_app.c | 18 +++++++++---------
dcb/dcb_app.h | 1 +
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dcb/dcb_app.c b/dcb/dcb_app.c
index df339babd8e6..1d0da35f987d 100644
--- a/dcb/dcb_app.c
+++ b/dcb/dcb_app.c
@@ -570,7 +570,7 @@ int dcb_app_get(struct dcb *dcb, const char *dev, struct dcb_app_table *tab)
void *payload;
int ret;
- ret = dcb_get_attribute_va(dcb, dev, DCB_ATTR_IEEE_APP_TABLE, &payload, &payload_len);
+ ret = dcb_get_attribute_va(dcb, dev, tab->attr, &payload, &payload_len);
if (ret != 0)
return ret;
@@ -588,7 +588,7 @@ static int dcb_app_add_del_cb(struct dcb *dcb, struct nlmsghdr *nlh, void *data)
struct nlattr *nest;
size_t i;
- nest = mnl_attr_nest_start(nlh, DCB_ATTR_IEEE_APP_TABLE);
+ nest = mnl_attr_nest_start(nlh, add_del->tab->attr);
for (i = 0; i < add_del->tab->n_apps; i++) {
const struct dcb_app *app = &add_del->tab->apps[i];
@@ -697,7 +697,7 @@ static int dcb_cmd_app_parse_add_del(struct dcb *dcb, const char *dev,
static int dcb_cmd_app_add(struct dcb *dcb, const char *dev, int argc, char **argv)
{
- struct dcb_app_table tab = {};
+ struct dcb_app_table tab = { .attr = DCB_ATTR_IEEE_APP_TABLE };
int ret;
ret = dcb_cmd_app_parse_add_del(dcb, dev, argc, argv, &tab);
@@ -711,7 +711,7 @@ static int dcb_cmd_app_add(struct dcb *dcb, const char *dev, int argc, char **ar
static int dcb_cmd_app_del(struct dcb *dcb, const char *dev, int argc, char **argv)
{
- struct dcb_app_table tab = {};
+ struct dcb_app_table tab = { .attr = DCB_ATTR_IEEE_APP_TABLE };
int ret;
ret = dcb_cmd_app_parse_add_del(dcb, dev, argc, argv, &tab);
@@ -725,7 +725,7 @@ static int dcb_cmd_app_del(struct dcb *dcb, const char *dev, int argc, char **ar
static int dcb_cmd_app_show(struct dcb *dcb, const char *dev, int argc, char **argv)
{
- struct dcb_app_table tab = {};
+ struct dcb_app_table tab = { .attr = DCB_ATTR_IEEE_APP_TABLE };
int ret;
ret = dcb_app_get(dcb, dev, &tab);
@@ -777,7 +777,7 @@ out:
static int dcb_cmd_app_flush(struct dcb *dcb, const char *dev, int argc, char **argv)
{
- struct dcb_app_table tab = {};
+ struct dcb_app_table tab = { .attr = DCB_ATTR_IEEE_APP_TABLE };
int ret;
ret = dcb_app_get(dcb, dev, &tab);
@@ -830,9 +830,9 @@ out:
static int dcb_cmd_app_replace(struct dcb *dcb, const char *dev, int argc, char **argv)
{
- struct dcb_app_table orig = {};
- struct dcb_app_table tab = {};
- struct dcb_app_table new = {};
+ struct dcb_app_table orig = { .attr = DCB_ATTR_IEEE_APP_TABLE };
+ struct dcb_app_table tab = { .attr = DCB_ATTR_IEEE_APP_TABLE };
+ struct dcb_app_table new = { .attr = DCB_ATTR_IEEE_APP_TABLE };
int ret;
ret = dcb_app_get(dcb, dev, &orig);
diff --git a/dcb/dcb_app.h b/dcb/dcb_app.h
index 8e7b010dcf75..3aea0bfd1786 100644
--- a/dcb/dcb_app.h
+++ b/dcb/dcb_app.h
@@ -7,6 +7,7 @@ struct dcb;
struct dcb_app_table {
struct dcb_app *apps;
size_t n_apps;
+ int attr;
};
struct dcb_app_add_del {
--
2.34.1
Powered by blists - more mailing lists