diff options
Diffstat (limited to 'net/switchdev/switchdev.c')
-rw-r--r-- | net/switchdev/switchdev.c | 7 |
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 | } |
564 | EXPORT_SYMBOL_GPL(call_switchdev_notifiers); | 565 | EXPORT_SYMBOL_GPL(call_switchdev_notifiers); |
@@ -580,9 +581,11 @@ int unregister_switchdev_blocking_notifier(struct notifier_block *nb) | |||
580 | EXPORT_SYMBOL_GPL(unregister_switchdev_blocking_notifier); | 581 | EXPORT_SYMBOL_GPL(unregister_switchdev_blocking_notifier); |
581 | 582 | ||
582 | int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev, | 583 | int 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 | } |