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/en_fs.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 | wireguard-linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.xz wireguard-linux-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/en_fs.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c index 92d8364e98f7..f2762e45c8ae 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c @@ -1136,7 +1136,7 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv) MLX5_FLOW_NAMESPACE_KERNEL); if (!priv->fs.ns) - return -EINVAL; + return -EOPNOTSUPP; err = mlx5e_arfs_create_tables(priv); if (err) { |