[ofa-general] Re: [PATCH] fix for an IPoIB compile error

[Shirley Ma]

Recreated the patch against 2.6.25 branch git tree.

Thanks
Shirley

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c
b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index a082466..d116854 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -181,6 +181,7 @@ static int ipoib_change_mtu(struct net_device *dev,
int new_mtu)
 {
 	struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+#ifdef CONFIG_INFINIBAND_IPOIB_CM
 	/* dev->mtu > 2K ==> connected mode */
 	if (ipoib_cm_admin_enabled(dev)) {
 		if (new_mtu > ipoib_cm_max_mtu(dev))
@@ -193,6 +194,7 @@ static int ipoib_change_mtu(struct net_device *dev,
int new_mtu)
 		dev->mtu = new_mtu;
 		return 0;
 	}
+#endif
 
 	if (new_mtu > IPOIB_PACKET_SIZE - IPOIB_ENCAP_LEN)
 		return -EINVAL;