From a795211fe543c3238a05e58fee9c0be48f2d6986 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Wed, 7 Nov 2018 15:14:09 -0800 Subject: [PATCH] bridge: fdb: remove redundant dev string in show output After commit 4abb8c723a64 ("bridge: fdb: Fix for missing keywords in non-JSON output"), I am seeing a double print for dev in bridge fdb show. eg: "44:38:39:00:6a:82 dev dev bridge vlan 1 master bridge permanent" this patch removes the redundant print. Fixes: 4abb8c723a64 ("bridge: fdb: Fix for missing keywords in non-JSON output") CC: Phil Sutter Signed-off-by: Roopa Prabhu Acked-by: Phil Sutter Signed-off-by: Stephen Hemminger --- bridge/fdb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index f82938f8..a5abc1b6 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -181,13 +181,10 @@ int print_fdb(struct nlmsghdr *n, void *arg) "mac", "%s ", lladdr); } - if (!filter_index && r->ndm_ifindex) { - if (!is_json_context()) - fprintf(fp, "dev "); + if (!filter_index && r->ndm_ifindex) print_color_string(PRINT_ANY, COLOR_IFNAME, "ifname", "dev %s ", ll_index_to_name(r->ndm_ifindex)); - } if (tb[NDA_DST]) { int family = AF_INET;