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
|
From 50a9c893a750c4eef7fbf60f5b6eb4833e35a943 Mon Sep 17 00:00:00 2001
From: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Date: Wed, 24 Jul 2019 21:43:49 +0300
Subject: [PATCH] staging: dpaa2-evb: Update netlink attributes API
Account for upstream changes in some nla functions.
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
---
drivers/staging/fsl-dpaa2/evb/evb.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/drivers/staging/fsl-dpaa2/evb/evb.c
+++ b/drivers/staging/fsl-dpaa2/evb/evb.c
@@ -532,8 +532,8 @@ static int evb_setlink(struct net_device
attr = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
if (attr) {
- err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, attr,
- ifla_br_policy, NULL);
+ err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_MAX, attr,
+ ifla_br_policy, NULL);
if (unlikely(err)) {
netdev_err(netdev,
"nla_parse_nested for br_policy err %d\n",
@@ -596,7 +596,7 @@ static int __nla_put_port(struct sk_buff
struct nlattr *nest;
int err;
- nest = nla_nest_start(skb, IFLA_PROTINFO | NLA_F_NESTED);
+ nest = nla_nest_start_noflag(skb, IFLA_PROTINFO | NLA_F_NESTED);
if (!nest) {
netdev_err(netdev, "nla_nest_start failed\n");
return -ENOMEM;
@@ -648,7 +648,7 @@ static int __nla_put_vlan(struct sk_buff
u16 i;
int err;
- nest = nla_nest_start(skb, IFLA_AF_SPEC);
+ nest = nla_nest_start_noflag(skb, IFLA_AF_SPEC);
if (!nest) {
netdev_err(netdev, "nla_nest_start failed");
return -ENOMEM;
@@ -739,7 +739,8 @@ static int evb_dellink(struct net_device
if (!spec)
return 0;
- err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, spec, ifla_br_policy, NULL);
+ err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_MAX, spec,
+ ifla_br_policy, NULL);
if (unlikely(err))
return err;
|
