Merge branch 'tc-ets-qdisc' into next

[mirror_iproute2.git] / tc / m_ct.c

diff --git a/tc/m_ct.c b/tc/m_ct.c
index 8589cb9a3c5153e20440214ea433e9297cefbeb0..70d186e859f4b694fbb6c9a75a1014c3f7ac0dba 100644 (file)
--- a/tc/m_ct.c
+++ b/tc/m_ct.c
@@ -316,7 +316,6 @@ parse_ct(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
 
        parse_action_control_dflt(&argc, &argv, &sel.action, false,
                                  TC_ACT_PIPE);
-       NEXT_ARG_FWD();
 
        addattr16(n, MAX_MSG, TCA_CT_ACTION, ct_action);
        addattr_l(n, MAX_MSG, TCA_CT_PARMS, &sel, sizeof(sel));
@@ -360,7 +359,7 @@ static void ct_print_nat(int ct_action, struct rtattr **tb)
 {
        size_t done = 0;
        char out[256] = "";
-       bool nat;
+       bool nat = false;
 
        if (!(ct_action & TCA_CT_ACT_NAT))
                return;
@@ -467,14 +466,15 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)
                print_string(PRINT_ANY, "action", " %s", "clear");
        }
 
-       print_masked_u32("mark", tb[TCA_CT_MARK], tb[TCA_CT_MARK_MASK]);
-       print_masked_u16("zone", tb[TCA_CT_ZONE], NULL);
+       print_masked_u32("mark", tb[TCA_CT_MARK], tb[TCA_CT_MARK_MASK], false);
+       print_masked_u16("zone", tb[TCA_CT_ZONE], NULL, false);
        ct_print_labels(tb[TCA_CT_LABELS], tb[TCA_CT_LABELS_MASK]);
        ct_print_nat(ct_action, tb);
 
        print_action_control(f, " ", p->action, "");
 
-       print_uint(PRINT_ANY, "index", "\n\t index %u", p->index);
+       print_nl();
+       print_uint(PRINT_ANY, "index", "\t index %u", p->index);
        print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
        print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
 
@@ -485,7 +485,7 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)
                        print_tm(f, tm);
                }
        }
-       print_string(PRINT_FP, NULL, "%s", "\n ");
+       print_nl();
 
        return 0;
 }