[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit 2b88947645f25fa5d43dab2d255dba2782952925
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Thu Mar 22 22:24:29 2012 -0500

    iscsi tools: fix bnx2i login
    
    This patch fixes a regression added by:
    
    commit 04b4a6699f63c4f0bab9523aae3efb8c909d6587
    iscsi tools: have iscsi tools bring up offload net iface
    
    I was using SIOCSIFFLAGS instead of SIOCGIFFLAGS, so if
    the interface was up we were not detecting this and resetting
    it. This then caused iscsiuio to not be ready and it would
    end up failing requests with EAGAIN. In many cases we would
    run out of retries before iscsiuio was ready and so the
    operation would fail.

diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
index 212cc59..ebdd407 100644
--- a/usr/iscsi_net_util.c
+++ b/usr/iscsi_net_util.c
@@ -330,7 +330,7 @@ int net_ifup_netdev(char *netdev)
 
 	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
-	if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
 		log_error("Could not bring up netdev %s (err %d - %s)",
 			  netdev, errno, strerror(errno));
 		ret = errno;

-- 
Debian Open-iSCSI Packaging