Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / net / mlx4 / srq.c

diff --git a/drivers/net/mlx4/srq.c b/drivers/net/mlx4/srq.c
index b061c86d6839aa3bd72aa0a7828f98c477b4bec9..d23f46d692ef5daf02ad7076842b4859c558bd82 100644 (file)
--- a/drivers/net/mlx4/srq.c
+++ b/drivers/net/mlx4/srq.c
@@ -227,7 +227,7 @@ int mlx4_srq_query(struct mlx4_dev *dev, struct mlx4_srq *srq, int *limit_waterm
        err = mlx4_QUERY_SRQ(dev, mailbox, srq->srqn);
        if (err)
                goto err_out;
-       *limit_watermark = srq_context->limit_watermark;
+       *limit_watermark = be16_to_cpu(srq_context->limit_watermark);
 
 err_out:
        mlx4_free_cmd_mailbox(dev, mailbox);
@@ -235,7 +235,7 @@ err_out:
 }
 EXPORT_SYMBOL_GPL(mlx4_srq_query);
 
-int __devinit mlx4_init_srq_table(struct mlx4_dev *dev)
+int mlx4_init_srq_table(struct mlx4_dev *dev)
 {
        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
        int err;