summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-10-21 16:40:21 -0400
committerDoug Ledford <dledford@redhat.com>2015-10-21 16:40:21 -0400
commitfc81a06965396150a395b1fe29f1bd13d4825ad6 (patch)
treee08fd551a033e039db7361fa011baf1e51b5830f /drivers/net
parent070b399723206a4ed80410358f801a7df68d08e6 (diff)
parent0ca81a2840f77855bbad1b9f172c545c4dc9e6a4 (diff)
downloadlinux-stable-fc81a06965396150a395b1fe29f1bd13d4825ad6.tar.gz
linux-stable-fc81a06965396150a395b1fe29f1bd13d4825ad6.tar.bz2
linux-stable-fc81a06965396150a395b1fe29f1bd13d4825ad6.zip
Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4
Pick up the late fixes from the 4.3 cycle so we have them in our next branch.
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/fw.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index aa0d5ffe92d8..9335e5ae18cc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -200,25 +200,3 @@ int mlx5_cmd_teardown_hca(struct mlx5_core_dev *dev)
return err;
}
-
-int mlx5_core_query_special_context(struct mlx5_core_dev *dev, u32 *rsvd_lkey)
-{
- struct mlx5_cmd_query_special_contexts_mbox_in in;
- struct mlx5_cmd_query_special_contexts_mbox_out out;
- int err;
-
- memset(&in, 0, sizeof(in));
- memset(&out, 0, sizeof(out));
- in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);
- err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
- if (err)
- return err;
-
- if (out.hdr.status)
- err = mlx5_cmd_status_to_err(&out.hdr);
-
- *rsvd_lkey = be32_to_cpu(out.resd_lkey);
-
- return err;
-}
-EXPORT_SYMBOL(mlx5_core_query_special_context);