From e87ddead0306371afc32ba1d77508ea839bbf6b3 Mon Sep 17 00:00:00 2001
From: Jack Morgenstein <jackm@dev.mellanox.co.il>
Date: Tue, 13 Dec 2011 04:15:46 +0000
Subject: [PATCH] --- yaml --- r: 278777 b: refs/heads/master c:
 8e59d254feb3826230d19fb643691c89eabd71f8 h: refs/heads/master i:   278775:
 309f77923c6f2e44c72943f3ff2d19157d253246 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/infiniband/hw/mlx4/main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ecc1db69a414..57b213e85c58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c82e9aa0a8bcf7a1643ccb71678bab57f3cb4bc6
+refs/heads/master: 8e59d254feb3826230d19fb643691c89eabd71f8
diff --git a/trunk/drivers/infiniband/hw/mlx4/main.c b/trunk/drivers/infiniband/hw/mlx4/main.c
index 34f8a5d9da75..b8279deb614d 100644
--- a/trunk/drivers/infiniband/hw/mlx4/main.c
+++ b/trunk/drivers/infiniband/hw/mlx4/main.c
@@ -1075,6 +1075,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 
 	printk_once(KERN_INFO "%s", mlx4_ib_version);
 
+	if (mlx4_is_mfunc(dev)) {
+		printk(KERN_WARNING "IB not yet supported in SRIOV\n");
+		return NULL;
+	}
+
 	mlx4_foreach_ib_transport_port(i, dev)
 		num_ports++;