diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 | 
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 | 
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /net/switchdev/switchdev.c | |
| parent | 9b41da80e09128574f09bed8dc5a5fc6f72a8239 (diff) | |
| parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'net/switchdev/switchdev.c')
| -rw-r--r-- | net/switchdev/switchdev.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 3b95fe980fa2..017801f9dbaa 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -624,13 +624,10 @@ EXPORT_SYMBOL_GPL(unregister_switchdev_notifier);  int call_switchdev_notifiers(unsigned long val, struct net_device *dev,  			     struct switchdev_notifier_info *info)  { -	int err; -  	ASSERT_RTNL();  	info->dev = dev; -	err = raw_notifier_call_chain(&switchdev_notif_chain, val, info); -	return err; +	return raw_notifier_call_chain(&switchdev_notif_chain, val, info);  }  EXPORT_SYMBOL_GPL(call_switchdev_notifiers);  | 
