aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev
diff options
context:
space:
mode:
authorPetr Machata <petrm@mellanox.com>2018-12-12 12:02:54 -0500
committerDavid S. Miller <davem@davemloft.net>2018-12-12 19:34:22 -0500
commit479c86dc551c9720765ed19433990eae6a1f899f (patch)
treeecd13ac6dcb54e24d367e781fd5c7bb600804ee7 /net/switchdev
parent69b7320e14e6e8c7a77fa5803cecc86434a1162d (diff)
net: switchdev: Add extack to struct switchdev_notifier_info
In order to pass extack to the drivers that need it, add an extack field to struct switchdev_notifier_info, and an extack argument to the function call_switchdev_blocking_notifiers(). Also add a helper function switchdev_notifier_info_to_extack(). Signed-off-by: Petr Machata <petrm@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Acked-by: Ivan Vecera <ivecera@redhat.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev')
-rw-r--r--net/switchdev/switchdev.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index cb20669bf6ce..aa84acfb6632 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -368,7 +368,7 @@ static int switchdev_port_obj_notify(enum switchdev_notifier_type nt,
368 .handled = false, 368 .handled = false,
369 }; 369 };
370 370
371 rc = call_switchdev_blocking_notifiers(nt, dev, &obj_info.info); 371 rc = call_switchdev_blocking_notifiers(nt, dev, &obj_info.info, extack);
372 err = notifier_to_errno(rc); 372 err = notifier_to_errno(rc);
373 if (err) { 373 if (err) {
374 WARN_ON(!obj_info.handled); 374 WARN_ON(!obj_info.handled);
@@ -559,6 +559,7 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
559 struct switchdev_notifier_info *info) 559 struct switchdev_notifier_info *info)
560{ 560{
561 info->dev = dev; 561 info->dev = dev;
562 info->extack = NULL;
562 return atomic_notifier_call_chain(&switchdev_notif_chain, val, info); 563 return atomic_notifier_call_chain(&switchdev_notif_chain, val, info);
563} 564}
564EXPORT_SYMBOL_GPL(call_switchdev_notifiers); 565EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
@@ -580,9 +581,11 @@ int unregister_switchdev_blocking_notifier(struct notifier_block *nb)
580EXPORT_SYMBOL_GPL(unregister_switchdev_blocking_notifier); 581EXPORT_SYMBOL_GPL(unregister_switchdev_blocking_notifier);
581 582
582int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev, 583int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev,
583 struct switchdev_notifier_info *info) 584 struct switchdev_notifier_info *info,
585 struct netlink_ext_ack *extack)
584{ 586{
585 info->dev = dev; 587 info->dev = dev;
588 info->extack = extack;
586 return blocking_notifier_call_chain(&switchdev_blocking_notif_chain, 589 return blocking_notifier_call_chain(&switchdev_blocking_notif_chain,
587 val, info); 590 val, info);
588} 591}