diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
| commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
| tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /drivers/net/ethernet/mellanox/mlx5/core/vport.c | |
| parent | net: phy: broadcom: rehook BCM54612E specific init (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.xz linux-dev-e2160156bf2a7d5018e99a9993fbcdda0abac09b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/vport.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c index b49cfc895c10..15c2294dd2b4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c @@ -549,7 +549,7 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev, if (!MLX5_CAP_GEN(mdev, vport_group_manager)) return -EACCES; if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify)) - return -ENOTSUPP; + return -EOPNOTSUPP; in = mlx5_vzalloc(inlen); if (!in) |