[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[rhel5-branch] iscsi: with ibft, wait for link with waitForLink(). (#727774)



---
 loader2/net.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/loader2/net.c b/loader2/net.c
index 9e5733d..ee63154 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -2300,8 +2300,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
             devmacaddr = nl_mac2str(devices[i]);
 	    if(!strcasecmp(devmacaddr, ibftmacaddr)){
                 logMessage(INFO, "%s has the right MAC (%s), checking for link", devmacaddr, devices[i]);
-		free(devmacaddr);
-		if(get_link_status(devices[i]) == 1){
+		if (!waitForLink(devices[i])) {
 		    lookForLink = 0;
 		    loaderData->netDev = devices[i];
                     logMessage(INFO, "%s has link, using it", devices[i]);
@@ -2320,8 +2319,8 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
 	    }
 	    else{
                 logMessage(DEBUGLVL, "%s (%s) is not it...", devices[i], devmacaddr);
-		free(devmacaddr);
 	    }
+            free(devmacaddr);
 	}
 
 	break;
-- 
1.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]