Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output

[Stephen Hemminger]

On Wed,  7 Nov 2018 15:14:09 -0800
Roopa Prabhu  wrote:

> From: Roopa Prabhu 
> 
> 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 

Applied, thanks.

Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output

[Stephen Hemminger]

On Thu, 8 Nov 2018 10:35:05 +0100
Phil Sutter  wrote:

> Hi Roopa,
> 
> On Wed, Nov 07, 2018 at 03:14:09PM -0800, Roopa Prabhu wrote:
> > From: Roopa Prabhu 
> > 
> > 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.

Re: [PATCH iproute2] bridge: fdb: remove redundant dev string in show output

[Phil Sutter]

Hi Roopa,

On Wed, Nov 07, 2018 at 03:14:09PM -0800, Roopa Prabhu wrote:
> From: Roopa Prabhu 
> 
> 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 
> Signed-off-by: Roopa Prabhu 

Acked-by: Phil Sutter 

[PATCH iproute2] bridge: fdb: remove redundant dev string in show output

[Roopa Prabhu]

From: Roopa Prabhu 

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