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

bridge: vlan json: skip ports with empty vlans 

The non-json output prints 'None' for such vlans.
And this can garble json output.

Fixes: d82a49ce85 ("bridge: add json support for bridge vlan show")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu 2016-08-07 12:37:03 -07:00 committed by Stephen Hemminger
parent 9579afb24e
commit 1eeb6fdac8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/vlan.c
View File

@ -212,7 +212,7 @@ static int print_vlan(const struct sockaddr_nl *who,
/* if AF_SPEC isn't there, vlan table is not preset for this port */ /* if AF_SPEC isn't there, vlan table is not preset for this port */
if (!tb[IFLA_AF_SPEC]) { if (!tb[IFLA_AF_SPEC]) {
if (!filter_vlan) if (!filter_vlan && !jw_global)
fprintf(fp, "%s\tNone\n", fprintf(fp, "%s\tNone\n",
ll_index_to_name(ifm->ifi_index)); ll_index_to_name(ifm->ifi_index));
return 0; return 0;