diff options
| author | David S. Miller <davem@davemloft.net> | 2023-02-17 11:06:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-02-17 11:06:39 +0000 |
| commit | 675f176b4dcc2b75adbcea7ba0e9a649527f53bd (patch) | |
| tree | dc5eea870c19b405bb6558964e5367bb6c9205c5 /net/devlink | |
| parent | 84cb1b53cdbad52642571e31a8aee301206d2043 (diff) | |
| parent | ec35307e18ba8174e2a3f701956059f6a36f22fb (diff) | |
| download | linux-stable-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.gz linux-stable-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.bz2 linux-stable-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Some of the devlink bits were tricky, but I think I got it right.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/devlink')
| -rw-r--r-- | net/devlink/dev.c | 2 | ||||
| -rw-r--r-- | net/devlink/leftover.c | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/net/devlink/dev.c b/net/devlink/dev.c index b40153fa2680..bf1d6f1bcfc7 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -343,8 +343,6 @@ static void devlink_reload_netns_change(struct devlink *devlink, * reload process so the notifications are generated separatelly. */ devlink_notify_unregister(devlink); - move_netdevice_notifier_net(curr_net, dest_net, - &devlink->netdevice_nb); write_pnet(&devlink->_net, dest_net); devlink_notify_register(devlink); } diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c index dffca2f9bfa7..8fc85ba3f6e0 100644 --- a/net/devlink/leftover.c +++ b/net/devlink/leftover.c @@ -3837,6 +3837,19 @@ int devlink_resources_validate(struct devlink *devlink, return err; } +static void devlink_param_notify(struct devlink *devlink, + unsigned int port_index, + struct devlink_param_item *param_item, + enum devlink_command cmd); + +struct devlink_info_req { + struct sk_buff *msg; + void (*version_cb)(const char *version_name, + enum devlink_info_version_type version_type, + void *version_cb_priv); + void *version_cb_priv; +}; + static const struct devlink_param devlink_param_generic[] = { { .id = DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET, |