netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH iproute2] bridge: fdb: remove redundant dev string in show output
@ 2018-11-07 23:14 Roopa Prabhu
  2018-11-08  9:35 ` Phil Sutter
  2018-11-09 16:05 ` Stephen Hemminger
  0 siblings, 2 replies; 4+ messages in thread
From: Roopa Prabhu @ 2018-11-07 23:14 UTC (permalink / raw)
  To: stephen; +Cc: netdev, phil, nikolay, dsahern

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>
---
 bridge/fdb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output
  2018-11-07 23:14 [PATCH iproute2] bridge: fdb: remove redundant dev string in show output Roopa Prabhu
@ 2018-11-08  9:35 ` Phil Sutter
  2018-11-09 15:54   ` Stephen Hemminger
  2018-11-09 16:05 ` Stephen Hemminger
  1 sibling, 1 reply; 4+ messages in thread
From: Phil Sutter @ 2018-11-08  9:35 UTC (permalink / raw)
  To: Roopa Prabhu; +Cc: stephen, netdev, nikolay, dsahern

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>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output
  2018-11-08  9:35 ` Phil Sutter
@ 2018-11-09 15:54   ` Stephen Hemminger
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Hemminger @ 2018-11-09 15:54 UTC (permalink / raw)
  To: Phil Sutter; +Cc: Roopa Prabhu, netdev, nikolay, dsahern

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output
  2018-11-07 23:14 [PATCH iproute2] bridge: fdb: remove redundant dev string in show output Roopa Prabhu
  2018-11-08  9:35 ` Phil Sutter
@ 2018-11-09 16:05 ` Stephen Hemminger
  1 sibling, 0 replies; 4+ messages in thread
From: Stephen Hemminger @ 2018-11-09 16:05 UTC (permalink / raw)
  To: Roopa Prabhu; +Cc: netdev, phil, nikolay, dsahern

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-11-10  1:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-07 23:14 [PATCH iproute2] bridge: fdb: remove redundant dev string in show output Roopa Prabhu
2018-11-08  9:35 ` Phil Sutter
2018-11-09 15:54   ` Stephen Hemminger
2018-11-09 16:05 ` Stephen Hemminger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).