git.openwrt.org Git - openwrt/staging/ynezz.git/blob

   1 From 50a9c893a750c4eef7fbf60f5b6eb4833e35a943 Mon Sep 17 00:00:00 2001
   2 From: Ioana Radulescu <ruxandra.radulescu@nxp.com>
   3 Date: Wed, 24 Jul 2019 21:43:49 +0300
   4 Subject: [PATCH] staging: dpaa2-evb: Update netlink attributes API
   5
   6 Account for upstream changes in some nla functions.
   7
   8 Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
   9 ---
  10  drivers/staging/fsl-dpaa2/evb/evb.c | 11 ++++++-----
  11  1 file changed, 6 insertions(+), 5 deletions(-)
  12
  13 --- a/drivers/staging/fsl-dpaa2/evb/evb.c
  14 +++ b/drivers/staging/fsl-dpaa2/evb/evb.c
  15 @@ -532,8 +532,8 @@ static int evb_setlink(struct net_device
  16
  17         attr = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
  18         if (attr) {
  19 -               err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, attr,
  20 -                                      ifla_br_policy, NULL);
  21 +               err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_MAX, attr,
  22 +                                                 ifla_br_policy, NULL);
  23                 if (unlikely(err)) {
  24                         netdev_err(netdev,
  25                                    "nla_parse_nested for br_policy err %d\n",
  26 @@ -596,7 +596,7 @@ static int __nla_put_port(struct sk_buff
  27         struct nlattr   *nest;
  28         int             err;
  29
  30 -       nest = nla_nest_start(skb, IFLA_PROTINFO | NLA_F_NESTED);
  31 +       nest = nla_nest_start_noflag(skb, IFLA_PROTINFO | NLA_F_NESTED);
  32         if (!nest) {
  33                 netdev_err(netdev, "nla_nest_start failed\n");
  34                 return -ENOMEM;
  35 @@ -648,7 +648,7 @@ static int __nla_put_vlan(struct sk_buff
  36         u16                     i;
  37         int                     err;
  38
  39 -       nest = nla_nest_start(skb, IFLA_AF_SPEC);
  40 +       nest = nla_nest_start_noflag(skb, IFLA_AF_SPEC);
  41         if (!nest) {
  42                 netdev_err(netdev, "nla_nest_start failed");
  43                 return -ENOMEM;
  44 @@ -739,7 +739,8 @@ static int evb_dellink(struct net_device
  45         if (!spec)
  46                 return 0;
  47
  48 -       err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, spec, ifla_br_policy, NULL);
  49 +       err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_MAX, spec,
  50 +                                         ifla_br_policy, NULL);
  51         if (unlikely(err))
  52                 return err;
  53