summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorSaeed Mahameed <saeedm@mellanox.com>2019-06-28 15:49:59 -0700
committerSaeed Mahameed <saeedm@mellanox.com>2019-06-28 16:03:54 -0700
commit4f5d1beadc10b62e141338570b9c32d857814bb0 (patch)
tree696eb17dac463485b9a56e84526323d394eae38f /net/core
parent5cdda5f1d6adde02da591ca2196f20289977dc56 (diff)
parent92ab1eb392c6ac6f7fdeee4bfdfb39aa860a371f (diff)
downloadlinux-4f5d1beadc10b62e141338570b9c32d857814bb0.tar.bz2
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 'net/core')
-rw-r--r--net/core/devlink.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 4baf716e535e..89c533778135 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1549,7 +1549,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;
@@ -1625,7 +1626,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;