1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From 17a9864b376f8ad0e19736ce53a3d7798679a0b8 Mon Sep 17 00:00:00 2001
From: Camelia Groza <camelia.groza@nxp.com>
Date: Wed, 3 Jul 2019 15:27:01 +0300
Subject: [PATCH] sdk_dpaa: ceetm: align to upstream API changes
Align to the following upstream patches:
8cb0817 netlink: make validation more configurable for future strictness
ae0be8d netlink: make nla_nest_start() add NLA_F_NESTED flag
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
---
drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
@@ -650,7 +650,7 @@ static int ceetm_dump(struct Qdisc *sch,
return -EINVAL;
}
- nest = nla_nest_start(skb, TCA_OPTIONS);
+ nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
if (!nest)
goto nla_put_failure;
if (nla_put(skb, TCA_CEETM_QOPS, sizeof(qopt), &qopt))
@@ -1133,7 +1133,7 @@ static int ceetm_init(struct Qdisc *sch,
if (ret)
return ret;
- ret = nla_parse_nested(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
+ ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
if (ret < 0) {
pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
return ret;
@@ -1307,7 +1307,7 @@ static int ceetm_change(struct Qdisc *sc
pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
- ret = nla_parse_nested(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
+ ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
if (ret < 0) {
pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
return ret;
@@ -1527,7 +1527,7 @@ static int ceetm_cls_change(struct Qdisc
return -EINVAL;
}
- err = nla_parse_nested(tb, TCA_CEETM_COPT, opt, ceetm_policy, NULL);
+ err = nla_parse_nested_deprecated(tb, TCA_CEETM_COPT, opt, ceetm_policy, NULL);
if (err < 0) {
pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
return -EINVAL;
@@ -1728,7 +1728,7 @@ static int ceetm_cls_dump(struct Qdisc *
break;
}
- nest = nla_nest_start(skb, TCA_OPTIONS);
+ nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
if (!nest)
goto nla_put_failure;
if (nla_put(skb, TCA_CEETM_COPT, sizeof(copt), &copt))
|
