matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devlink: finish queue.h to list.h transition 

Loose the "q" from the names and name the structure fields in the same
way rest of the code does. Also, fix list_add arg order which leads
to segfault.

Fixes: 33267017fa ("iproute2: devlink: port from sys/queue.h to list.h")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Jiri Pirko 2019-08-05 11:56:56 +02:00 committed by Stephen Hemminger
parent 4dd599fdb8
commit efd12cd2d9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devlink/devlink.c
View File

@ -5978,35 +5978,36 @@ static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
return MNL_CB_OK;
}
struct nest_qentry {
struct nest_entry {
int attr_type;
struct list_head nest_entries;
struct list_head list;
};
struct fmsg_cb_data {
struct dl *dl;
uint8_t value_type;
struct list_head qhead;
struct list_head entry_list;
};
static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
uint8_t *attr_value, bool insert)
{
struct nest_qentry *entry = NULL;
struct nest_entry *entry;
if (insert) {
entry = malloc(sizeof(struct nest_qentry));
entry = malloc(sizeof(struct nest_entry));
if (!entry)
return -ENOMEM;
entry->attr_type = *attr_value;
list_add(&fmsg_data->qhead, &entry->nest_entries);
list_add(&entry->list, &fmsg_data->entry_list);
} else {
if (list_empty(&fmsg_data->qhead))
if (list_empty(&fmsg_data->entry_list))
return MNL_CB_ERROR;
entry = list_first_entry(&fmsg_data->qhead, struct nest_qentry, nest_entries);
entry = list_first_entry(&fmsg_data->entry_list,
struct nest_entry, list);
*attr_value = entry->attr_type;
list_del(&entry->nest_entries);
list_del(&entry->list);
free(entry);
}
return MNL_CB_OK;
@ -6115,7 +6116,7 @@ static int cmd_health_object_common(struct dl *dl, uint8_t cmd, uint16_t flags)
return err;
data.dl = dl;
INIT_LIST_HEAD(&data.qhead);
INIT_LIST_HEAD(&data.entry_list);
err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_fmsg_object_cb, &data);
return err;
}