From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Thu, 25 May 2017 20:37:47 +0000 (+0300)
Subject: Revert "iwpmd: Enable the port mapper service for iWarp providers."
X-Git-Tag: vofed-4.8-rc4^0
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=db5475ae0be5fcc5e8d1d2f14feda6d073731745;p=~tnikolova%2Fcompat-rdma%2F.git

Revert "iwpmd: Enable the port mapper service for iWarp providers."

This reverts commit de76aaec433b7ca4905d5435d4f5592e3c789ea9.
---

diff --git a/ofed_scripts/openibd b/ofed_scripts/openibd
index e63facc..91ff444 100644
--- a/ofed_scripts/openibd
+++ b/ofed_scripts/openibd
@@ -299,18 +299,6 @@ get_mlx4_en_interfaces()
     done
 }
 
-enable_iwpmd()
-{
-	if command -v "systemctl" > /dev/null 2>&1 ; then
-		if [ "systemctl is-enabled iwpmd" != "enabled" ]; then
-			systemctl enable iwpmd
-		fi
-		if [ "systemctl is-active iwpmd" != "active" ]; then
-			systemctl start iwpmd
-		fi
-	fi
-}
-
 # If module $1 is loaded return - 0 else - 1
 is_module()
 {
@@ -830,7 +818,6 @@ start()
         fi
     fi
 
-    local need_iwpmd=0
     # Load Mellanox HCA driver
     if [ "X${MTHCA_LOAD}" == "Xyes" ]; then
         load_module ib_mthca
@@ -940,8 +927,6 @@ start()
         my_rc=$?
         if [ $my_rc -ne 0 ]; then
                 echo_failure $"Loading cxgb4 driver: "
-	else
-		need_iwpmd=1
         fi
         RC=$[ $RC + $my_rc ]
     fi
@@ -953,8 +938,6 @@ start()
         my_rc=$?
         if [ $my_rc -ne 0 ]; then
                 echo_failure $"Loading nes driver: "
-	else
-		need_iwpmd=1
         fi
         RC=$[ $RC + $my_rc ]
     fi
@@ -966,8 +949,6 @@ start()
         my_rc=$?
         if [ $my_rc -ne 0 ]; then
                 echo_failure $"Loading i40iw driver: "
-	else
-		need_iwpmd=1
         fi
         RC=$[ $RC + $my_rc ]
     fi
@@ -1006,10 +987,6 @@ start()
         RC=$[ $RC + $? ]
     fi
 
-    if [ $need_iwpmd -eq 1 ]; then
-	enable_iwpmd
-    fi
-
     if [ $RC -eq 0 ]; then
         echo_success $"Loading HCA driver and Access Layer: "
     else