diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-14 18:01:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-14 18:01:45 -0800 |
| commit | f97d139aaafdc20145ad6a6b8d188ac8e58b5413 (patch) | |
| tree | 2419223f36539cca9ad967c24e1291edfe72e2f7 /net | |
| parent | d0db136ffb59bfb8d66b45dba277191db6914f49 (diff) | |
| parent | 84179981317fb4fb3e9df5acd42ea33cf6037793 (diff) | |
Merge tag 'mlx5-updates-2019-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2019-11-12
1) Merge mlx5-next for devlink reload and flowtable offloads dependencies
2) Devlink reload support
3) TC Flowtable offloads
4) Misc cleanup
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/devlink.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 9bad78388a07..1338f5fbc7d2 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -3006,6 +3006,11 @@ static const struct devlink_param devlink_param_generic[] = { .name = DEVLINK_PARAM_GENERIC_RESET_DEV_ON_DRV_PROBE_NAME, .type = DEVLINK_PARAM_GENERIC_RESET_DEV_ON_DRV_PROBE_TYPE, }, + { + .id = DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE, + .name = DEVLINK_PARAM_GENERIC_ENABLE_ROCE_NAME, + .type = DEVLINK_PARAM_GENERIC_ENABLE_ROCE_TYPE, + }, }; static int devlink_param_generic_verify(const struct devlink_param *param) |