Message ID | 1541632449-9993-1-git-send-email-roopa@cumulusnetworks.com |
---|---|
State | Accepted, archived |
Delegated to: | stephen hemminger |
Headers | show |
Series | [iproute2] bridge: fdb: remove redundant dev string in show output | expand |
Hi Roopa, On Wed, Nov 07, 2018 at 03:14:09PM -0800, Roopa Prabhu wrote: > From: Roopa Prabhu <roopa@cumulusnetworks.com> > > 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") Oh, stupid mistake. :( Thanks for the fix! > CC: Phil Sutter <phil@nwl.cc> > Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Acked-by: Phil Sutter <phil@nwl.cc>
On Thu, 8 Nov 2018 10:35:05 +0100 Phil Sutter <phil@nwl.cc> wrote: > Hi Roopa, > > On Wed, Nov 07, 2018 at 03:14:09PM -0800, Roopa Prabhu wrote: > > From: Roopa Prabhu <roopa@cumulusnetworks.com> > > > > 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") Applied.
On Wed, 7 Nov 2018 15:14:09 -0800 Roopa Prabhu <roopa@cumulusnetworks.com> wrote: > From: Roopa Prabhu <roopa@cumulusnetworks.com> > > 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 <phil@nwl.cc> > Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Applied, thanks.
diff --git a/bridge/fdb.c b/bridge/fdb.c index f82938f..a5abc1b 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;