Merging upstream version 2.12.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
078c0dbcc0
commit
635faa7346
571 changed files with 10718 additions and 2738 deletions
|
@ -47,6 +47,7 @@ static char *mac_addr_to_string(unsigned char mac_addr[6])
|
|||
return mac_string;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_JSONC
|
||||
static json_object *hfi_to_json(struct nbft_info_hfi *hfi)
|
||||
{
|
||||
struct json_object *hfi_json;
|
||||
|
@ -348,6 +349,9 @@ fail:
|
|||
json_free_object(nbft_json_array);
|
||||
return -ENOMEM;
|
||||
}
|
||||
#else /* CONFIG_JSONC */
|
||||
#define json_show_nbfts(nbft_list, show_subsys, show_hfi, show_discovery) -EINVAL
|
||||
#endif /* CONFIG_JSONC */
|
||||
|
||||
static void print_nbft_hfi_info(struct nbft_info *nbft)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue