42 files changed, 70 insertions, 68 deletions

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 5a87e271d35a..641ad7575f24 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -242,7 +242,7 @@ static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
                                (unsigned long)p->tcfa_tm.lastuse))
                         continue;
 
-                nest = nla_nest_start(skb, n_i);
+                nest = nla_nest_start_noflag(skb, n_i);
                 if (!nest) {
                         index--;
                         goto nla_put_failure;
@@ -299,7 +299,7 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
         struct tc_action *p;
         unsigned long id = 1;
 
-        nest = nla_nest_start(skb, 0);
+        nest = nla_nest_start_noflag(skb, 0);
         if (nest == NULL)
                 goto nla_put_failure;
         if (nla_put_string(skb, TCA_KIND, ops->kind))
@@ -776,7 +776,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
         }
         rcu_read_unlock();
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         err = tcf_action_dump_old(skb, a, bind, ref);
@@ -800,7 +800,7 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[],
 
         for (i = 0; i < TCA_ACT_MAX_PRIO && actions[i]; i++) {
                 a = actions[i];
-                nest = nla_nest_start(skb, a->order);
+                nest = nla_nest_start_noflag(skb, a->order);
                 if (nest == NULL)
                         goto nla_put_failure;
                 err = tcf_action_dump_1(skb, a, bind, ref);
@@ -1052,7 +1052,7 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[],
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
-        nest = nla_nest_start(skb, TCA_ACT_TAB);
+        nest = nla_nest_start_noflag(skb, TCA_ACT_TAB);
         if (!nest)
                 goto out_nlmsg_trim;
 
@@ -1176,7 +1176,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
-        nest = nla_nest_start(skb, TCA_ACT_TAB);
+        nest = nla_nest_start_noflag(skb, TCA_ACT_TAB);
         if (!nest) {
                 NL_SET_ERR_MSG(extack, "Failed to add new netlink message");
                 goto out_module_put;
@@ -1508,7 +1508,7 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
         if (!count_attr)
                 goto out_module_put;
 
-        nest = nla_nest_start(skb, TCA_ACT_TAB);
+        nest = nla_nest_start_noflag(skb, TCA_ACT_TAB);
         if (nest == NULL)
                 goto out_module_put;
 
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 31c6ffb6abe7..7a87ce2e5a76 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -387,7 +387,7 @@ static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife)
         if (list_empty(&ife->metalist))
                 return 0;
 
-        nest = nla_nest_start(skb, TCA_IFE_METALST);
+        nest = nla_nest_start_noflag(skb, TCA_IFE_METALST);
         if (!nest)
                 goto out_nlmsg_trim;
 
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 287793abfaf9..ce4b54fa7834 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -108,14 +108,15 @@ err_out:
 static int tcf_pedit_key_ex_dump(struct sk_buff *skb,
                                  struct tcf_pedit_key_ex *keys_ex, int n)
 {
-        struct nlattr *keys_start = nla_nest_start(skb, TCA_PEDIT_KEYS_EX);
+        struct nlattr *keys_start = nla_nest_start_noflag(skb,
+                                                          TCA_PEDIT_KEYS_EX);
 
         if (!keys_start)
                 goto nla_failure;
         for (; n > 0; n--) {
                 struct nlattr *key_start;
 
-                key_start = nla_nest_start(skb, TCA_PEDIT_KEY_EX);
+                key_start = nla_nest_start_noflag(skb, TCA_PEDIT_KEY_EX);
                 if (!key_start)
                         goto nla_failure;
 
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index d5aaf90a3971..45c0c253c7e8 100644
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -426,7 +426,7 @@ static int tunnel_key_geneve_opts_dump(struct sk_buff *skb,
         u8 *src = (u8 *)(info + 1);
         struct nlattr *start;
 
-        start = nla_nest_start(skb, TCA_TUNNEL_KEY_ENC_OPTS_GENEVE);
+        start = nla_nest_start_noflag(skb, TCA_TUNNEL_KEY_ENC_OPTS_GENEVE);
         if (!start)
                 return -EMSGSIZE;
 
@@ -460,7 +460,7 @@ static int tunnel_key_opts_dump(struct sk_buff *skb,
         if (!info->options_len)
                 return 0;
 
-        start = nla_nest_start(skb, TCA_TUNNEL_KEY_ENC_OPTS);
+        start = nla_nest_start_noflag(skb, TCA_TUNNEL_KEY_ENC_OPTS);
         if (!start)
                 return -EMSGSIZE;
 
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 9115f053883f..78de717afddf 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3111,7 +3111,7 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
                  * tc data even if iproute2  was newer - jhs
                  */
                 if (exts->type != TCA_OLD_COMPAT) {
-                        nest = nla_nest_start(skb, exts->action);
+                        nest = nla_nest_start_noflag(skb, exts->action);
                         if (nest == NULL)
                                 goto nla_put_failure;
 
@@ -3120,7 +3120,7 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
                         nla_nest_end(skb, nest);
                 } else if (exts->police) {
                         struct tc_action *act = tcf_exts_first_act(exts);
-                        nest = nla_nest_start(skb, exts->police);
+                        nest = nla_nest_start_noflag(skb, exts->police);
                         if (nest == NULL || !act)
                                 goto nla_put_failure;
                         if (tcf_action_dump_old(skb, act, 0, 0) < 0)
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 687b0af67878..dd5fdb62c6df 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -288,7 +288,7 @@ static int basic_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = f->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index b4ac58039cb1..6fd569c5a036 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -591,7 +591,7 @@ static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         cls_bpf_offload_update_stats(tp, prog);
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 4c1567854f95..b680dd684282 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -176,7 +176,7 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = head->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index eece1ee26930..cb29fe7d5ed3 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -629,7 +629,7 @@ static int flow_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = f->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0d8968803e98..8d4f7a672f14 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -2051,7 +2051,7 @@ static int fl_dump_key_geneve_opt(struct sk_buff *skb,
         struct nlattr *nest;
         int opt_off = 0;
 
-        nest = nla_nest_start(skb, TCA_FLOWER_KEY_ENC_OPTS_GENEVE);
+        nest = nla_nest_start_noflag(skb, TCA_FLOWER_KEY_ENC_OPTS_GENEVE);
         if (!nest)
                 goto nla_put_failure;
 
@@ -2087,7 +2087,7 @@ static int fl_dump_key_options(struct sk_buff *skb, int enc_opt_type,
         if (!enc_opts->len)
                 return 0;
 
-        nest = nla_nest_start(skb, enc_opt_type);
+        nest = nla_nest_start_noflag(skb, enc_opt_type);
         if (!nest)
                 goto nla_put_failure;
 
@@ -2333,7 +2333,7 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = f->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 goto nla_put_failure;
 
@@ -2384,7 +2384,7 @@ static int fl_tmplt_dump(struct sk_buff *skb, struct net *net, void *tmplt_priv)
         struct fl_flow_key *key, *mask;
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index ad036b00427d..3fcc1d51b9d7 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -402,7 +402,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, void *fh,
         if (!f->res.classid && !tcf_exts_has_actions(&f->exts))
                 return skb->len;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index a13bc351a414..d54fa8e11b9e 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -303,7 +303,7 @@ static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = head->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index f006af23b64a..b3b9b151a61d 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -607,7 +607,7 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = f->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 0719a21d9c41..fa059cf934a6 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -706,7 +706,7 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = f->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 24e0a62a65cc..1a2e7d5a8776 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -601,7 +601,7 @@ static int tcindex_dump(struct net *net, struct tcf_proto *tp, void *fh,
                  tp, fh, skb, t, p, r);
         pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h);
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 48e76a3acf8a..499477058b2d 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -1294,7 +1294,7 @@ static int u32_dump(struct net *net, struct tcf_proto *tp, void *fh,
 
         t->tcm_handle = n->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 1331a4c2d8ff..6f2d6a761dbe 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -440,14 +440,14 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv)
         struct nlattr *top_start;
         struct nlattr *list_start;
 
-        top_start = nla_nest_start(skb, tlv);
+        top_start = nla_nest_start_noflag(skb, tlv);
         if (top_start == NULL)
                 goto nla_put_failure;
 
         if (nla_put(skb, TCA_EMATCH_TREE_HDR, sizeof(tree->hdr), &tree->hdr))
                 goto nla_put_failure;
 
-        list_start = nla_nest_start(skb, TCA_EMATCH_TREE_LIST);
+        list_start = nla_nest_start_noflag(skb, TCA_EMATCH_TREE_LIST);
         if (list_start == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c126b9f78d6e..6c81b22d214f 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -542,7 +542,7 @@ static int qdisc_dump_stab(struct sk_buff *skb, struct qdisc_size_table *stab)
 {
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_STAB);
+        nest = nla_nest_start_noflag(skb, TCA_STAB);
         if (nest == NULL)
                 goto nla_put_failure;
         if (nla_put(skb, TCA_STAB_BASE, sizeof(stab->szopts), &stab->szopts))
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index d714d3747bcb..c36aa57eb4af 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -609,7 +609,7 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
         tcm->tcm_handle = flow->common.classid;
         tcm->tcm_info = flow->q->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 259d97bc2abd..50db72fe44de 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -2735,7 +2735,7 @@ static int cake_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct cake_sched_data *q = qdisc_priv(sch);
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!opts)
                 goto nla_put_failure;
 
@@ -2806,7 +2806,7 @@ nla_put_failure:
 
 static int cake_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
 {
-        struct nlattr *stats = nla_nest_start(d->skb, TCA_STATS_APP);
+        struct nlattr *stats = nla_nest_start_noflag(d->skb, TCA_STATS_APP);
         struct cake_sched_data *q = qdisc_priv(sch);
         struct nlattr *tstats, *ts;
         int i;
@@ -2836,7 +2836,7 @@ static int cake_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
 #undef PUT_STAT_U32
 #undef PUT_STAT_U64
 
-        tstats = nla_nest_start(d->skb, TCA_CAKE_STATS_TIN_STATS);
+        tstats = nla_nest_start_noflag(d->skb, TCA_CAKE_STATS_TIN_STATS);
         if (!tstats)
                 goto nla_put_failure;
 
@@ -2853,7 +2853,7 @@ static int cake_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
         for (i = 0; i < q->tin_cnt; i++) {
                 struct cake_tin_data *b = &q->tins[q->tin_order[i]];
 
-                ts = nla_nest_start(d->skb, i + 1);
+                ts = nla_nest_start_noflag(d->skb, i + 1);
                 if (!ts)
                         goto nla_put_failure;
 
@@ -2973,7 +2973,7 @@ static int cake_dump_class_stats(struct Qdisc *sch, unsigned long cl,
         if (flow) {
                 ktime_t now = ktime_get();
 
-                stats = nla_nest_start(d->skb, TCA_STATS_APP);
+                stats = nla_nest_start_noflag(d->skb, TCA_STATS_APP);
                 if (!stats)
                         return -1;
 
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 114b9048ea7e..243bce4b888b 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1305,7 +1305,7 @@ static int cbq_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct cbq_sched_data *q = qdisc_priv(sch);
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (cbq_dump_attr(skb, &q->link) < 0)
@@ -1340,7 +1340,7 @@ cbq_dump_class(struct Qdisc *sch, unsigned long arg,
         tcm->tcm_handle = cl->common.classid;
         tcm->tcm_info = cl->q->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (cbq_dump_attr(skb, cl) < 0)
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index f68fd7a0e038..adffc6d68c06 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -449,7 +449,7 @@ static int cbs_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct tc_cbs_qopt opt = { };
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index eafc0d17d174..eda21dc94bde 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -452,7 +452,7 @@ static int choke_dump(struct Qdisc *sch, struct sk_buff *skb)
                 .Scell_log      = q->parms.Scell_log,
         };
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
index 17cd81f84b5d..60ac4e61ce3a 100644
--- a/net/sched/sch_codel.c
+++ b/net/sched/sch_codel.c
@@ -217,7 +217,7 @@ static int codel_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct codel_sched_data *q = qdisc_priv(sch);
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 430df9a55ec4..022db73fd5a9 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -244,7 +244,7 @@ static int drr_dump_class(struct Qdisc *sch, unsigned long arg,
         tcm->tcm_handle = cl->common.classid;
         tcm->tcm_info   = cl->qdisc->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (nla_put_u32(skb, TCA_DRR_QUANTUM, cl->quantum))
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 42471464ded3..cdf744e710f1 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -432,7 +432,7 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
         tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl - 1);
         tcm->tcm_info = p->q->handle;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
         if (nla_put_u8(skb, TCA_DSMARK_MASK, p->mv[cl - 1].mask) ||
@@ -451,7 +451,7 @@ static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct dsmark_qdisc_data *p = qdisc_priv(sch);
         struct nlattr *opts = NULL;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
         if (nla_put_u16(skb, TCA_DSMARK_INDICES, p->indices))
diff --git a/net/sched/sch_etf.c b/net/sched/sch_etf.c
index 1150f22983df..67107caa287c 100644
--- a/net/sched/sch_etf.c
+++ b/net/sched/sch_etf.c
@@ -460,7 +460,7 @@ static int etf_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct tc_etf_qopt opt = { };
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 1a662f2bb7bb..5ca370e78d3a 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -823,7 +823,7 @@ static int fq_dump(struct Qdisc *sch, struct sk_buff *skb)
         u64 ce_threshold = q->ce_threshold;
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index cd04d40c30b6..825a933b019a 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -527,7 +527,7 @@ static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct fq_codel_sched_data *q = qdisc_priv(sch);
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 234afbf9115b..9bfa15e12d23 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -772,7 +772,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
         if (gred_offload_dump_stats(sch))
                 goto nla_put_failure;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
         if (nla_put(skb, TCA_GRED_DPS, sizeof(sopt), &sopt))
@@ -790,7 +790,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
                 goto nla_put_failure;
 
         /* Old style all-in-one dump of VQs */
-        parms = nla_nest_start(skb, TCA_GRED_PARMS);
+        parms = nla_nest_start_noflag(skb, TCA_GRED_PARMS);
         if (parms == NULL)
                 goto nla_put_failure;
 
@@ -841,7 +841,7 @@ append_opt:
         nla_nest_end(skb, parms);
 
         /* Dump the VQs again, in more structured way */
-        vqs = nla_nest_start(skb, TCA_GRED_VQ_LIST);
+        vqs = nla_nest_start_noflag(skb, TCA_GRED_VQ_LIST);
         if (!vqs)
                 goto nla_put_failure;
 
@@ -852,7 +852,7 @@ append_opt:
                 if (!q)
                         continue;
 
-                vq = nla_nest_start(skb, TCA_GRED_VQ_ENTRY);
+                vq = nla_nest_start_noflag(skb, TCA_GRED_VQ_ENTRY);
                 if (!vq)
                         goto nla_put_failure;
 
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index d2ab463f22ae..97d2fb91c39f 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1300,7 +1300,7 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
         if (cl->level == 0)
                 tcm->tcm_info = cl->qdisc->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (hfsc_dump_curves(skb, cl) < 0)
diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
index 9d6a47697406..43bc159c4f7c 100644
--- a/net/sched/sch_hhf.c
+++ b/net/sched/sch_hhf.c
@@ -654,7 +654,7 @@ static int hhf_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct hhf_sched_data *q = qdisc_priv(sch);
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 2f9883b196e8..64010aec5437 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1057,7 +1057,7 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
         gopt.defcls = q->defcls;
         gopt.debug = 0;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
@@ -1086,7 +1086,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
         if (!cl->level && cl->leaf.q)
                 tcm->tcm_info = cl->leaf.q->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index ce3f55259d0d..0bac926b46c7 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -106,7 +106,7 @@ static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index ea0dc112b38d..7afefed72d35 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -349,7 +349,7 @@ static int dump_rates(struct mqprio_sched *priv,
         int i;
 
         if (priv->flags & TC_MQPRIO_F_MIN_RATE) {
-                nest = nla_nest_start(skb, TCA_MQPRIO_MIN_RATE64);
+                nest = nla_nest_start_noflag(skb, TCA_MQPRIO_MIN_RATE64);
                 if (!nest)
                         goto nla_put_failure;
 
@@ -363,7 +363,7 @@ static int dump_rates(struct mqprio_sched *priv,
         }
 
         if (priv->flags & TC_MQPRIO_F_MAX_RATE) {
-                nest = nla_nest_start(skb, TCA_MQPRIO_MAX_RATE64);
+                nest = nla_nest_start_noflag(skb, TCA_MQPRIO_MAX_RATE64);
                 if (!nest)
                         goto nla_put_failure;
 
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index cc9d8133afcd..0242c0d4a2d0 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -1079,7 +1079,7 @@ static int dump_loss_model(const struct netem_sched_data *q,
 {
         struct nlattr *nest;
 
-        nest = nla_nest_start(skb, TCA_NETEM_LOSS);
+        nest = nla_nest_start_noflag(skb, TCA_NETEM_LOSS);
         if (nest == NULL)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c
index 1cc0c7b74aa3..9bf41f4a2312 100644
--- a/net/sched/sch_pie.c
+++ b/net/sched/sch_pie.c
@@ -491,7 +491,7 @@ static int pie_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct pie_sched_data *q = qdisc_priv(sch);
         struct nlattr *opts;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!opts)
                 goto nla_put_failure;
 
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 1589364b54da..bab2d4026e8b 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -619,7 +619,7 @@ static int qfq_dump_class(struct Qdisc *sch, unsigned long arg,
         tcm->tcm_handle = cl->common.classid;
         tcm->tcm_info   = cl->qdisc->handle;
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
         if (nla_put_u32(skb, TCA_QFQ_WEIGHT, cl->agg->class_weight) ||
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 4e8c0abf6194..b9f34e057e87 100644
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -318,7 +318,7 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
         if (err)
                 goto nla_put_failure;
 
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
         if (nla_put(skb, TCA_RED_PARMS, sizeof(opt), &opt) ||
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index 2419fdb75966..f54b00a431a3 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -580,7 +580,7 @@ static int sfb_dump(struct Qdisc *sch, struct sk_buff *skb)
         };
 
         sch->qstats.backlog = q->qdisc->qstats.backlog;
-        opts = nla_nest_start(skb, TCA_OPTIONS);
+        opts = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
         if (nla_put(skb, TCA_SFB_PARMS, sizeof(opt), &opt))
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index df848a36b222..e016ee07dd1f 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -841,7 +841,7 @@ static int dump_entry(struct sk_buff *msg,
 {
         struct nlattr *item;
 
-        item = nla_nest_start(msg, TCA_TAPRIO_SCHED_ENTRY);
+        item = nla_nest_start_noflag(msg, TCA_TAPRIO_SCHED_ENTRY);
         if (!item)
                 return -ENOSPC;
 
@@ -883,7 +883,7 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
                 opt.offset[i] = dev->tc_to_txq[i].offset;
         }
 
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (!nest)
                 return -ENOSPC;
 
@@ -897,7 +897,8 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
         if (nla_put_s32(skb, TCA_TAPRIO_ATTR_SCHED_CLOCKID, q->clockid))
                 goto options_error;
 
-        entry_list = nla_nest_start(skb, TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST);
+        entry_list = nla_nest_start_noflag(skb,
+                                           TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST);
         if (!entry_list)
                 goto options_error;
 
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index f71578dbb9e3..3ae5a29eeab3 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -448,7 +448,7 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
         struct tc_tbf_qopt opt;
 
         sch->qstats.backlog = q->qdisc->qstats.backlog;
-        nest = nla_nest_start(skb, TCA_OPTIONS);
+        nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;