From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH iproute2 1/3] bridge: minor change to mdb print Date: Thu, 6 Sep 2018 16:30:55 +0100 Message-ID: <20180906153057.5379-1-stephen@networkplumber.org> Cc: Stephen Hemminger To: netdev@vger.kernel.org Return-path: Received: from mail-wr1-f48.google.com ([209.85.221.48]:44233 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730190AbeIFUHG (ORCPT ); Thu, 6 Sep 2018 16:07:06 -0400 Received: by mail-wr1-f48.google.com with SMTP id v16-v6so11846045wro.11 for ; Thu, 06 Sep 2018 08:31:03 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Get port ifname once rather than on both sides of if(is_json_context). Signed-off-by: Stephen Hemminger --- bridge/mdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridge/mdb.c b/bridge/mdb.c index f38dc67c849a..9bdef0262c54 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -208,19 +208,19 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n, } else { struct rtattr *i = RTA_DATA(router); uint32_t *port_ifindex = RTA_DATA(i); + const char *port_name = ll_index_to_name(*port_ifindex); if (is_json_context()) { open_json_array(PRINT_JSON, brifname); open_json_object(NULL); print_string(PRINT_JSON, "port", NULL, - ll_index_to_name(*port_ifindex)); + port_name); close_json_object(); close_json_array(PRINT_JSON, NULL); } else { fprintf(fp, "router port dev %s master %s\n", - ll_index_to_name(*port_ifindex), - brifname); + port_name, brifname); } } close_json_array(PRINT_JSON, NULL); -- 2.17.1