bridge: vlan json: skip ports with empty vlans

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

Fixes: d82a49ce85f0 ("bridge: add json support for bridge vlan show")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

diff --git a/bridge/vlan.c b/bridge/vlan.c
index f262cc7f13bc56afcfae7d75b9e6fc0f1cf94c9b..c2e635fce61daa7b3d783b9b08f2e434c7ff820a 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -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 (!tb[IFLA_AF_SPEC]) {
-               if (!filter_vlan)
+               if (!filter_vlan && !jw_global)
                        fprintf(fp, "%s\tNone\n",
                                ll_index_to_name(ifm->ifi_index));
                return 0;