aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_api.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-02-16 16:03:39 -0500
committerDavid S. Miller <davem@davemloft.net>2018-02-16 16:03:39 -0500
commitee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a (patch)
tree63f71ac24b38a93233eec17193fd7f0e63419e20 /net/sched/cls_api.c
parentf6581c704a8e50aa624ce1f94c2efa58c3f6ac86 (diff)
net: Revert sched action extack support series.
It was mis-applied and the changes had rejects. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_api.c')
-rw-r--r--net/sched/cls_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index f21610c5da1a..2bc1bc23d42e 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1434,7 +1434,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
1434 if (exts->police && tb[exts->police]) { 1434 if (exts->police && tb[exts->police]) {
1435 act = tcf_action_init_1(net, tp, tb[exts->police], 1435 act = tcf_action_init_1(net, tp, tb[exts->police],
1436 rate_tlv, "police", ovr, 1436 rate_tlv, "police", ovr,
1437 TCA_ACT_BIND, extack); 1437 TCA_ACT_BIND);
1438 if (IS_ERR(act)) 1438 if (IS_ERR(act))
1439 return PTR_ERR(act); 1439 return PTR_ERR(act);
1440 1440
@@ -1447,7 +1447,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
1447 1447
1448 err = tcf_action_init(net, tp, tb[exts->action], 1448 err = tcf_action_init(net, tp, tb[exts->action],
1449 rate_tlv, NULL, ovr, TCA_ACT_BIND, 1449 rate_tlv, NULL, ovr, TCA_ACT_BIND,
1450 &actions, extack); 1450 &actions);
1451 if (err) 1451 if (err)
1452 return err; 1452 return err;
1453 list_for_each_entry(act, &actions, list) 1453 list_for_each_entry(act, &actions, list)