diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-06-18 22:44:36 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-06-18 22:44:36 -0400 |
| commit | 12dbc04db08dc225b0e06cc5bb99c2dfa8236df9 (patch) | |
| tree | 37c45467a103aa428e05d63adf9660d547a04acb /include/net/devlink.h | |
| parent | 7608bf40cf2480057ec0da31456cc428791c32ef (diff) | |
| parent | 82b11f071936a11094e1c44730030cd3d894e0b4 (diff) | |
| download | cachepc-linux-12dbc04db08dc225b0e06cc5bb99c2dfa8236df9.tar.gz cachepc-linux-12dbc04db08dc225b0e06cc5bb99c2dfa8236df9.zip | |
Merge remote-tracking branch 'mlx5-next/mlx5-next' into HEAD
Take mlx5-next so we can take a dependent two patch series next.
Signed-off-by: Doug Ledford <dledford@redhat.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 1c4adfb4195a..7a34fc586def 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -530,8 +530,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); |