]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
bridge: minor change to mdb print
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 6 Sep 2018 13:14:46 +0000 (14:14 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 10 Sep 2018 18:47:11 +0000 (11:47 -0700)
Get port ifname once rather than on both sides of if(is_json_context).

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
bridge/mdb.c

index f38dc67c849a333c01a6b25c5e33c0144c629aad..9bdef0262c546c7938e54ba0800b80f95d1fbef8 100644 (file)
@@ -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);