diff options
| author | Saeed Mahameed | 2019-06-29 00:49:59 +0200 |
|---|---|---|
| committer | Saeed Mahameed | 2019-06-29 01:03:54 +0200 |
| commit | 4f5d1beadc10b62e141338570b9c32d857814bb0 (patch) | |
| tree | 696eb17dac463485b9a56e84526323d394eae38f /include/net/devlink.h | |
| parent | ipv4: enable route flushing in network namespaces (diff) | |
| parent | net/mlx5: E-Switch, Enable vport metadata matching if firmware supports it (diff) | |
| download | kernel-qcow2-linux-4f5d1beadc10b62e141338570b9c32d857814bb0.tar.gz kernel-qcow2-linux-4f5d1beadc10b62e141338570b9c32d857814bb0.tar.xz kernel-qcow2-linux-4f5d1beadc10b62e141338570b9c32d857814bb0.zip | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Misc updates from mlx5-next branch:
1) E-Switch vport metadata support for source vport matching
2) Convert mkey_table to XArray
3) Shared IRQs and to use single IRQ for all async EQs
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'include/net/devlink.h')
| -rw-r--r-- | include/net/devlink.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/devlink.h b/include/net/devlink.h index 6c51e864336a..6625ea068d5e 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -528,8 +528,10 @@ struct devlink_ops { int (*eswitch_inline_mode_get)(struct devlink *devlink, u8 *p_inline_mode); int (*eswitch_inline_mode_set)(struct devlink *devlink, u8 inline_mode, struct netlink_ext_ack *extack); - int (*eswitch_encap_mode_get)(struct devlink *devlink, u8 *p_encap_mode); - int (*eswitch_encap_mode_set)(struct devlink *devlink, u8 encap_mode, + int (*eswitch_encap_mode_get)(struct devlink *devlink, + enum devlink_eswitch_encap_mode *p_encap_mode); + int (*eswitch_encap_mode_set)(struct devlink *devlink, + enum devlink_eswitch_encap_mode encap_mode, struct netlink_ext_ack *extack); int (*info_get)(struct devlink *devlink, struct devlink_info_req *req, struct netlink_ext_ack *extack); |