aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorPetr Machata <petrm@mellanox.com>2018-12-06 12:05:42 -0500
committerDavid S. Miller <davem@davemloft.net>2018-12-06 16:26:07 -0500
commit567c5e13be5cc74d24f5eb54cf353c2e2277189b (patch)
treecefe2e937441614164f9a471a921c94801fe8c60 /net/core/dev.c
parentcf7686a01266de84b3b825acc05026d4e55454e1 (diff)
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. One prominent API through which the notification is invoked is dev_change_flags(). Therefore extend dev_change_flags() with and extra extack argument and update all users. Most of the calls end up just encoding NULL, but several sites (VLAN, ipvlan, VRF, rtnetlink) do have extack available. Since the function declaration line is changed anyway, name the other function arguments 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 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index b801c1aafd70..8bba6f98b545 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7595,11 +7595,13 @@ void __dev_notify_flags(struct net_device *dev, unsigned int old_flags,
7595 * dev_change_flags - change device settings 7595 * dev_change_flags - change device settings
7596 * @dev: device 7596 * @dev: device
7597 * @flags: device state flags 7597 * @flags: device state flags
7598 * @extack: netlink extended ack
7598 * 7599 *
7599 * Change settings on device based state flags. The flags are 7600 * Change settings on device based state flags. The flags are
7600 * in the userspace exported format. 7601 * in the userspace exported format.
7601 */ 7602 */
7602int dev_change_flags(struct net_device *dev, unsigned int flags) 7603int dev_change_flags(struct net_device *dev, unsigned int flags,
7604 struct netlink_ext_ack *extack)
7603{ 7605{
7604 int ret; 7606 int ret;
7605 unsigned int changes, old_flags = dev->flags, old_gflags = dev->gflags; 7607 unsigned int changes, old_flags = dev->flags, old_gflags = dev->gflags;