diff options
| author |   Petr Machata <petrm@mellanox.com> | 2018-12-06 17:05:43 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-06 13:26:07 -0800 |
| commit | 6d0403216d030e5623de3911168fceeaac2e14d6 (patch) | |
| tree | 8855e392e8346fb2dddae7e8c9ec2ea5b01bdeb2 /net/core/rtnetlink.c | |
| parent | net: core: dev: Add extack argument to dev_change_flags() (diff) | |
| download | linux-dev-6d0403216d030e5623de3911168fceeaac2e14d6.tar.xz linux-dev-6d0403216d030e5623de3911168fceeaac2e14d6.zip | |
net: core: dev: Add extack argument to __dev_change_flags()
In order to pass extack together with NETDEV_PRE_UP notifications, it's
necessary to route the extack to __dev_open() from diverse (possibly
indirect) callers. The last missing API is __dev_change_flags().
Therefore extend __dev_change_flags() with and extra extack argument and
update the two existing users.
Since the function declaration line is changed anyway, name the struct
net_device argument to placate checkpatch.
Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 4c9e4e187600..91a0f7477f8e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2871,7 +2871,8 @@ int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm) old_flags = dev->flags; if (ifm && (ifm->ifi_flags || ifm->ifi_change)) { - err = __dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm)); + err = __dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm), + NULL); if (err < 0) return err; } |