Merge branch 'master' into iproute2-next

[mirror_iproute2.git] / ip / ipntable.c

diff --git a/ip/ipntable.c b/ip/ipntable.c
index 4fae181dd3fa147eeac0d3de1e0ba91b0d2e1cc5..ce3f4614e32b47d5b891c7e7b940f4ca93a17507 100644 (file)
--- a/ip/ipntable.c
+++ b/ip/ipntable.c
@@ -346,7 +346,7 @@ static void print_ndtconfig(const struct ndt_config *ndtc)
                   "entry_size %u ", ndtc->ndtc_entry_size);
        print_uint(PRINT_ANY, "entries", "entries %u ", ndtc->ndtc_entries);
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 
        print_string(PRINT_ANY, "last_flush",
                     "        last_flush %s ",
@@ -355,7 +355,7 @@ static void print_ndtconfig(const struct ndt_config *ndtc)
                     "last_rand %s ",
                     ntable_strtime_delta(ndtc->ndtc_last_rand));
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 
        print_uint(PRINT_ANY, "hash_rnd",
                   "        hash_rnd %u ", ndtc->ndtc_hash_rnd);
@@ -367,7 +367,7 @@ static void print_ndtconfig(const struct ndt_config *ndtc)
        print_uint(PRINT_ANY, "proxy_qlen",
                   "proxy_qlen %u ", ndtc->ndtc_proxy_qlen);
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 }
 
 static void print_ndtparams(struct rtattr *tpb[])
@@ -379,7 +379,7 @@ static void print_ndtparams(struct rtattr *tpb[])
                print_string(PRINT_FP, NULL, "    dev ", NULL);
                print_color_string(PRINT_ANY, COLOR_IFNAME,
                                   "dev", "%s ", ll_index_to_name(ifindex));
-               print_string(PRINT_FP, NULL, "%s", _SL_);
+               print_nl();
        }
 
        print_string(PRINT_FP, NULL, "    ", NULL);
@@ -482,7 +482,7 @@ static void print_ndtparams(struct rtattr *tpb[])
                print_u64(PRINT_ANY, "locktime", "locktime %llu ", locktime);
        }
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 }
 
 static void print_ndtstats(const struct ndt_stats *ndts)
@@ -517,7 +517,7 @@ static void print_ndtstats(const struct ndt_stats *ndts)
        print_u64(PRINT_ANY, "forced_gc_runs", "forced_gc_runs %llu ",
                   ndts->ndts_forced_gc_runs);
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 }
 
 static int print_ntable(const struct sockaddr_nl *who,
@@ -579,7 +579,7 @@ static int print_ntable(const struct sockaddr_nl *who,
                print_string(PRINT_ANY, "name", "%s ", name);
        }
 
-       print_string(PRINT_FP, NULL, "%s", _SL_);
+       print_nl();
 
        ret = (tb[NDTA_THRESH1] || tb[NDTA_THRESH2] || tb[NDTA_THRESH3] ||
               tb[NDTA_GC_INTERVAL]);
@@ -611,7 +611,7 @@ static int print_ntable(const struct sockaddr_nl *who,
        }
 
        if (ret)
-               print_string(PRINT_FP, NULL, "%s", _SL_);
+               print_nl();
 
        if (tb[NDTA_CONFIG] && show_stats)
                print_ndtconfig(RTA_DATA(tb[NDTA_CONFIG]));
@@ -658,7 +658,7 @@ static int ipntable_show(int argc, char **argv)
                argc--; argv++;
        }
 
-       if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETNEIGHTBL) < 0) {
+       if (rtnl_neightbldump_req(&rth, preferred_family) < 0) {
                perror("Cannot send dump request");
                exit(1);
        }