diff mbox

[iproute2] bridge: vlan json: skip ports with empty vlans

Message ID 1470598623-17215-1-git-send-email-roopa@cumulusnetworks.com
State Accepted, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Roopa Prabhu Aug. 7, 2016, 7:37 p.m. UTC 
From: Roopa Prabhu <roopa@cumulusnetworks.com>

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>
---
saw this when deploying a mix of vlan filtering and non-vlan
filtering bridges.

 bridge/vlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Hemminger Aug. 8, 2016, 3:43 p.m. UTC | #1 
On Sun,  7 Aug 2016 12:37:03 -0700
Roopa Prabhu <roopa@cumulusnetworks.com> wrote:

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> 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>

Applied
diff mbox

Patch

diff --git a/bridge/vlan.c b/bridge/vlan.c
index 22f32a5..d3505b5 100644
--- 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;