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

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit fcd08dfbd02a279ffa69618a5216f6cf4f88e1da
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Sat Apr 2 05:17:04 2011 -0500

    iscsi tools: Don't try to bind offload EPs to sockets
    
    If discovery offload is not supported iscsiadm/iscsid
    drops down to normal socket based discovery. The
    problem is that io.c will try to bind the session
    to the socket if the iface has binding info, but
    for offload cards we will not be able to bind
    based on the hw address. This is because that will
    info is private to the iscsi function and not exposed
    to the network layer.

diff --git a/usr/io.c b/usr/io.c
index 28d9168..0c52a39 100644
--- a/usr/io.c
+++ b/usr/io.c
@@ -299,6 +299,9 @@ static int bind_conn_to_iface(iscsi_conn_t *conn, struct iface_rec *iface)
 {
 	struct iscsi_session *session = conn->session;
 
+	if (strcmp(iface->transport_name, DEFAULT_TRANSPORT))
+		return 0;
+
 	memset(session->netdev, 0, IFNAMSIZ);
 	if (iface_is_bound_by_hwaddr(iface) &&
 	    net_get_netdev_from_hwaddress(iface->hwaddress, session->netdev)) {

-- 
Debian Open-iSCSI Packaging