1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index b04b72ca32ed..fea737f520fd 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -597,7 +597,9 @@ void ipoib_mcast_join_task(struct work_struct *work)
 
         priv->mcast_mtu = ib_mtu_enum_to_int(priv->broadcast->mcmember.mtu) -
                 IPOIB_ENCAP_LEN;
-        dev->mtu = min(priv->mcast_mtu, priv->admin_mtu);
+
+        if (!ipoib_cm_admin_enabled(dev))
+                dev->mtu = min(priv->mcast_mtu, priv->admin_mtu);
 
         ipoib_dbg_mcast(priv, "successfully joined all multicast groups\n");