diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-06-19 04:44:36 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-06-19 04:44:36 +0200 |
| commit | 12dbc04db08dc225b0e06cc5bb99c2dfa8236df9 (patch) | |
| tree | 37c45467a103aa428e05d63adf9660d547a04acb /net | |
| parent | RDMA/odp: Fix missed unlock in non-blocking invalidate_start (diff) | |
| parent | net/mlx5: Expose eswitch encap mode (diff) | |
| download | linux-12dbc04db08dc225b0e06cc5bb99c2dfa8236df9.tar.xz 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 'net')
| -rw-r--r-- | net/core/devlink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index d43bc52b8840..47ae69363b07 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1552,7 +1552,8 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink, u32 seq, int flags) { const struct devlink_ops *ops = devlink->ops; - u8 inline_mode, encap_mode; + enum devlink_eswitch_encap_mode encap_mode; + u8 inline_mode; void *hdr; int err = 0; u16 mode; @@ -1628,7 +1629,8 @@ static int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, { struct devlink *devlink = info->user_ptr[0]; const struct devlink_ops *ops = devlink->ops; - u8 inline_mode, encap_mode; + enum devlink_eswitch_encap_mode encap_mode; + u8 inline_mode; int err = 0; u16 mode; |