diff -aurp open-iscsi/include/iscsi_if.h open-iscsi.work/include/iscsi_if.h --- open-iscsi/include/iscsi_if.h 2005-12-14 20:31:33.000000000 -0600 +++ open-iscsi.work/include/iscsi_if.h 2005-12-15 01:21:31.000000000 -0600 @@ -160,9 +160,8 @@ enum iscsi_param { ISCSI_PARAM_ERL = 11, ISCSI_PARAM_IFMARKER_EN = 12, ISCSI_PARAM_OFMARKER_EN = 13, - ISCSI_PARAM_RDMAEXTENSIONS = 14, }; -#define ISCSI_PARAM_MAX 15 +#define ISCSI_PARAM_MAX 14 typedef uint64_t iscsi_sessionh_t; /* iSCSI Data-Path session handle */ typedef uint64_t iscsi_connh_t; /* iSCSI Data-Path connection handle */ diff -aurp open-iscsi/usr/initiator.c open-iscsi.work/usr/initiator.c --- open-iscsi/usr/initiator.c 2005-12-15 01:22:00.000000000 -0600 +++ open-iscsi.work/usr/initiator.c 2005-12-14 22:27:47.000000000 -0600 @@ -437,9 +437,7 @@ __session_conn_create(iscsi_session_t *s conn_rec->address, host); } - /* Set the address family according to the value - that was received from a specific provider */ - conn->saddr.ss_family = session->provider->af; + conn->saddr.ss_family = AF_INET; conn->state = STATE_FREE; conn->session = session; @@ -856,10 +854,6 @@ __session_conn_recv_pdu(queue_item_t *it .param = ISCSI_PARAM_OFMARKER_EN, .value = &zero,/* FIXME: session->ofmarker_en */ .conn_only = 0, - }, { - .param = ISCSI_PARAM_RDMAEXTENSIONS, - .value = &session->rdma_ext, - .conn_only = 0, } /* diff -aurp open-iscsi/usr/ioctl.c open-iscsi.work/usr/ioctl.c --- open-iscsi/usr/ioctl.c 2005-12-15 01:22:00.000000000 -0600 +++ open-iscsi.work/usr/ioctl.c 2005-12-14 22:27:46.000000000 -0600 @@ -404,8 +404,6 @@ ktrans_list(void) strncpy(provider[i].name, ev.r.t_list.elements[i].name, ISCSI_TRANSPORT_NAME_MAXLEN); provider[i].caps = ev.r.t_list.elements[i].caps; - provider[i].af = ev.r.t_list.elements[i].af; - provider[i].rdma = ev.r.t_list.elements[i].rdma; } } return 0; diff -aurp open-iscsi/usr/netlink.c open-iscsi.work/usr/netlink.c --- open-iscsi/usr/netlink.c 2005-12-15 01:22:00.000000000 -0600 +++ open-iscsi.work/usr/netlink.c 2005-12-14 22:27:48.000000000 -0600 @@ -684,20 +684,6 @@ ktrans_list(void) "0x%x"); if (err) break; - - sprintf(filename, ISCSI_TRANSPORT_DIR"/%s/af", - provider[i].name); - err = read_transport_file(filename, &provider[i].af, - "%u"); - if (err) - break; - - sprintf(filename, ISCSI_TRANSPORT_DIR"/%s/rdma", - provider[i].name); - err = read_transport_file(filename, &provider[i].rdma, - "%u"); - if (err) - break; } for (i++; i < n; i++)