kernel: update 2.6.24 - .25 support

Update 2.6.24 - .25 compat patch.

1 files changed, 77 insertions, 87 deletions

diff --git a/kernel/2.6.24_compat.patch b/kernel/2.6.24_compat.patch
index f7e64b6..6e1ee09 100644
--- a/kernel/2.6.24_compat.patch
+++ b/kernel/2.6.24_compat.patch
@@ -1,8 +1,8 @@
 diff --git a/iscsi_tcp.c b/iscsi_tcp.c
-index 6214055..8563545 100644
+index caa116c..7c7527e 100644
 --- a/iscsi_tcp.c
 +++ b/iscsi_tcp.c
-@@ -444,11 +444,9 @@ static int iscsi_sw_tcp_pdu_init(struct iscsi_task *task,
+@@ -456,11 +456,9 @@ static int iscsi_sw_tcp_pdu_init(struct iscsi_task *task,
  	if (!task->sc)
  		iscsi_sw_tcp_send_linear_data_prep(conn, task->data, count);
  	else {
@@ -17,7 +17,7 @@ index 6214055..8563545 100644
  	}
  
  	if (err) {
-@@ -773,7 +771,11 @@ iscsi_sw_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max,
+@@ -793,7 +791,11 @@ iscsi_sw_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max,
  	shost->max_lun = iscsi_max_lun;
  	shost->max_id = 0;
  	shost->max_channel = 0;
@@ -29,7 +29,7 @@ index 6214055..8563545 100644
  
  	if (iscsi_host_add(shost, NULL))
  		goto free_host;
-@@ -821,6 +823,9 @@ static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev)
+@@ -846,6 +848,9 @@ static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev)
  }
  
  static struct scsi_host_template iscsi_sw_tcp_sht = {
@@ -39,15 +39,15 @@ index 6214055..8563545 100644
  	.module			= THIS_MODULE,
  	.name			= "iSCSI Initiator over TCP/IP",
  	.queuecommand           = iscsi_queuecommand,
-@@ -831,7 +836,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = {
+@@ -856,7 +861,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = {
  	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,
  	.eh_abort_handler       = iscsi_eh_abort,
  	.eh_device_reset_handler= iscsi_eh_device_reset,
 -	.eh_target_reset_handler= iscsi_eh_target_reset,
 +	.eh_host_reset_handler	= iscsi_eh_target_reset,
  	.use_clustering         = DISABLE_CLUSTERING,
+ 	.slave_alloc            = iscsi_sw_tcp_slave_alloc,
  	.slave_configure        = iscsi_sw_tcp_slave_configure,
- 	.proc_name		= "iscsi_tcp",
 diff --git a/iscsi_tcp.h b/iscsi_tcp.h
 index f9a4044..ab20530 100644
 --- a/iscsi_tcp.h
@@ -62,28 +62,28 @@ index f9a4044..ab20530 100644
  #include "libiscsi_tcp.h"
  
 diff --git a/libiscsi.c b/libiscsi.c
-index 5ac73fb..0b22b75 100644
+index fe4b66e..007bca1 100644
 --- a/libiscsi.c
 +++ b/libiscsi.c
-@@ -38,6 +38,8 @@
- #include "scsi_transport_iscsi.h"
- #include "libiscsi.h"
+@@ -60,6 +60,8 @@ MODULE_PARM_DESC(debug_libiscsi, "Turn on debugging for libiscsi module. "
+ 					     __func__, ##arg);		\
+ 	} while (0);
  
 +#include "open_iscsi_compat.h"
 +
  /* Serial Number Arithmetic, 32 bits, less than, RFC1982 */
  #define SNA32_CHECK 2147483648UL
  
-@@ -199,7 +201,7 @@ static int iscsi_prep_bidi_ahs(struct iscsi_task *task)
+@@ -229,7 +231,7 @@ static int iscsi_prep_bidi_ahs(struct iscsi_task *task)
  						  sizeof(rlen_ahdr->reserved));
  	rlen_ahdr->ahstype = ISCSI_AHSTYPE_RLENGTH;
  	rlen_ahdr->reserved = 0;
 -	rlen_ahdr->read_length = cpu_to_be32(scsi_in(sc)->length);
 +	rlen_ahdr->read_length = cpu_to_be32(scsi_bufflen(sc));
  
- 	debug_scsi("bidi-in rlen_ahdr->read_length(%d) "
- 		   "rlen_ahdr->ahslength(%d)\n",
-@@ -267,7 +269,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
+ 	ISCSI_DBG_SESSION(task->conn->session,
+ 			  "bidi-in rlen_ahdr->read_length(%d) "
+@@ -300,7 +302,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
  			return rc;
  	}
  	if (sc->sc_data_direction == DMA_TO_DEVICE) {
@@ -92,7 +92,7 @@ index 5ac73fb..0b22b75 100644
  		struct iscsi_r2t_info *r2t = &task->unsol_r2t;
  
  		hdr->data_length = cpu_to_be32(out_len);
-@@ -313,7 +315,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
+@@ -346,7 +348,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
  	} else {
  		hdr->flags |= ISCSI_FLAG_CMD_FINAL;
  		zero_data(hdr->dlength);
@@ -101,19 +101,19 @@ index 5ac73fb..0b22b75 100644
  
  		if (sc->sc_data_direction == DMA_FROM_DEVICE)
  			hdr->flags |= ISCSI_FLAG_CMD_READ;
-@@ -340,7 +342,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
- 		   "bidirectional" : sc->sc_data_direction == DMA_TO_DEVICE ?
- 		   "write" : "read", conn->id, sc, sc->cmnd[0], task->itt,
- 		   scsi_bufflen(sc),
--		   scsi_bidi_cmnd(sc) ? scsi_in(sc)->length : 0,
-+		   scsi_bidi_cmnd(sc) ? scsi_bufflen(sc) : 0,
- 		   session->cmdsn, session->max_cmdsn - session->exp_cmdsn + 1);
+@@ -373,7 +375,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
+ 			  sc->sc_data_direction == DMA_TO_DEVICE ?
+ 			  "write" : "read", conn->id, sc, sc->cmnd[0],
+ 			  task->itt, scsi_bufflen(sc),
+-			  scsi_bidi_cmnd(sc) ? scsi_in(sc)->length : 0,
++			  scsi_bidi_cmnd(sc) ? scsi_bufflen(sc) : 0,
+ 			  session->cmdsn,
+ 			  session->max_cmdsn - session->exp_cmdsn + 1);
  	return 0;
- }
-@@ -432,12 +434,7 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_task *task,
- 		conn->session->queued_cmdsn--;
+@@ -510,12 +512,7 @@ static void fail_scsi_task(struct iscsi_task *task, int err)
+ 		state = ISCSI_TASK_ABRT_TMF;
  
- 	sc->result = err;
+ 	sc->result = err << 16;
 -	if (!scsi_bidi_cmnd(sc))
 -		scsi_set_resid(sc, scsi_bufflen(sc));
 -	else {
@@ -122,9 +122,9 @@ index 5ac73fb..0b22b75 100644
 -	}
 +	scsi_set_resid(sc, scsi_bufflen(sc));
  
- 	if (conn->task == task)
- 		conn->task = NULL;
-@@ -631,7 +628,7 @@ invalid_datalen:
+ 	iscsi_complete_task(task, state);
+ }
+@@ -706,7 +703,7 @@ invalid_datalen:
  			goto out;
  		}
  
@@ -133,7 +133,7 @@ index 5ac73fb..0b22b75 100644
  		if (datalen < senselen)
  			goto invalid_datalen;
  
-@@ -647,8 +644,8 @@ invalid_datalen:
+@@ -723,8 +720,8 @@ invalid_datalen:
  
  		if (scsi_bidi_cmnd(sc) && res_count > 0 &&
  				(rhdr->flags & ISCSI_FLAG_CMD_BIDI_OVERFLOW ||
@@ -144,7 +144,7 @@ index 5ac73fb..0b22b75 100644
  		else
  			sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;
  	}
-@@ -697,8 +694,8 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
+@@ -773,8 +770,8 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
  
  		if (res_count > 0 &&
  		    (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||
@@ -155,10 +155,10 @@ index 5ac73fb..0b22b75 100644
  		else
  			sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;
  	}
-@@ -1408,12 +1405,7 @@ prepd_fault:
- fault:
+@@ -1498,12 +1495,7 @@ fault:
  	spin_unlock(&session->lock);
- 	debug_scsi("iscsi: cmd 0x%x is not queued (%d)\n", sc->cmnd[0], reason);
+ 	ISCSI_DBG_SESSION(session, "iscsi: cmd 0x%x is not queued (%d)\n",
+ 			  sc->cmnd[0], reason);
 -	if (!scsi_bidi_cmnd(sc))
 -		scsi_set_resid(sc, scsi_bufflen(sc));
 -	else {
@@ -170,7 +170,7 @@ index 5ac73fb..0b22b75 100644
  	spin_lock(host->host_lock);
  	return 0;
 diff --git a/libiscsi.h b/libiscsi.h
-index a261e2c..96fd795 100644
+index 1798fbe..c9174ec 100644
 --- a/libiscsi.h
 +++ b/libiscsi.h
 @@ -32,6 +32,8 @@
@@ -183,14 +183,13 @@ index a261e2c..96fd795 100644
  struct scsi_host_template;
  struct scsi_device;
 diff --git a/libiscsi_tcp.c b/libiscsi_tcp.c
-index 92cb13d..ea7dd8d 100644
+index c2b535b..76ead4b 100644
 --- a/libiscsi_tcp.c
 +++ b/libiscsi_tcp.c
-@@ -357,6 +357,17 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
+@@ -360,6 +360,16 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
+ 	struct scatterlist *sg;
+ 	unsigned int i;
  
- 	debug_scsi("iscsi_segment_seek_sg offset %u size %llu\n",
- 		  offset, size);
-+
 +	/*
 +	 * older kernels could send use_sg=0 for commands like sgio
 +	 * or scsi-ml commands.
@@ -203,18 +202,18 @@ index 92cb13d..ea7dd8d 100644
 +
  	__iscsi_segment_init(segment, size, done, hash);
  	for_each_sg(sg_list, sg, sg_count, i) {
- 		debug_scsi("sg %d, len %u offset %u\n", i, sg->length,
-@@ -469,7 +480,7 @@ static int iscsi_tcp_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
+ 		if (offset < sg->length) {
+@@ -471,7 +481,7 @@ static int iscsi_tcp_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
  	struct iscsi_tcp_task *tcp_task = task->dd_data;
  	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;
  	int datasn = be32_to_cpu(rhdr->datasn);
 -	unsigned total_in_length = scsi_in(task->sc)->length;
 +	unsigned total_in_length = scsi_bufflen(task->sc);
  
- 	iscsi_update_cmdsn(conn->session, (struct iscsi_nopin*)rhdr);
- 	if (tcp_conn->in.datalen == 0)
-@@ -557,11 +568,11 @@ static int iscsi_tcp_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
- 			    r2t->data_length, session->max_burst);
+ 	/*
+ 	 * lib iscsi will update this in the completion handling if there
+@@ -565,11 +575,11 @@ static int iscsi_tcp_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
+ 			      r2t->data_length, session->max_burst);
  
  	r2t->data_offset = be32_to_cpu(rhdr->data_offset);
 -	if (r2t->data_offset + r2t->data_length > scsi_out(task->sc)->length) {
@@ -227,7 +226,7 @@ index 92cb13d..ea7dd8d 100644
  		__kfifo_put(tcp_task->r2tpool.queue, (void*)&r2t,
  			    sizeof(void*));
  		return ISCSI_ERR_DATALEN;
-@@ -660,7 +671,6 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
+@@ -668,7 +678,6 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
  		if (tcp_conn->in.datalen) {
  			struct iscsi_tcp_task *tcp_task = task->dd_data;
  			struct hash_desc *rx_hash = NULL;
@@ -235,9 +234,9 @@ index 92cb13d..ea7dd8d 100644
  
  			/*
  			 * Setup copy of Data-In into the Scsi_Cmnd
-@@ -679,8 +689,8 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
- 				  tcp_task->data_offset,
- 				  tcp_conn->in.datalen);
+@@ -687,8 +696,8 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
+ 				      tcp_task->data_offset,
+ 				      tcp_conn->in.datalen);
  			rc = iscsi_segment_seek_sg(&tcp_conn->in.segment,
 -						   sdb->table.sgl,
 -						   sdb->table.nents,
@@ -531,7 +530,7 @@ index 0000000..fd9ef7b
 +
 +#endif
 diff --git a/scsi_transport_iscsi.c b/scsi_transport_iscsi.c
-index 4781d81..3b6c16d 100644
+index c9e95e7..6106e0e 100644
 --- a/scsi_transport_iscsi.c
 +++ b/scsi_transport_iscsi.c
 @@ -41,13 +41,13 @@ struct iscsi_internal {
@@ -632,16 +631,7 @@ index 4781d81..3b6c16d 100644
  {
  	struct Scsi_Host *shost = dev_to_shost(dev);
  	struct iscsi_cls_host *ihost = shost->shost_data;
-@@ -257,7 +257,7 @@ static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
- }
- 
- static int iscsi_remove_host(struct transport_container *tc, struct device *dev,
--			     struct device *cdev)
-+			     struct class_device *cdev)
- {
- 	struct Scsi_Host *shost = dev_to_shost(dev);
- 	struct iscsi_cls_host *ihost = shost->shost_data;
-@@ -723,7 +723,8 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
+@@ -698,7 +698,8 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
  	}
  	session->target_id = id;
  
@@ -651,7 +641,7 @@ index 4781d81..3b6c16d 100644
  	err = device_add(&session->dev);
  	if (err) {
  		iscsi_cls_session_printk(KERN_ERR, session,
-@@ -896,7 +897,8 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
+@@ -870,7 +871,8 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
  	if (!get_device(&session->dev))
  		goto free_conn;
  
@@ -661,16 +651,16 @@ index 4781d81..3b6c16d 100644
  	conn->dev.parent = &session->dev;
  	conn->dev.release = iscsi_conn_release;
  	err = device_register(&conn->dev);
-@@ -1305,6 +1307,8 @@ static int
+@@ -1309,6 +1311,8 @@ static int
  iscsi_if_transport_ep(struct iscsi_transport *transport,
  		      struct iscsi_uevent *ev, int msg_type)
  {
 +	return -ENOSYS;
 +#if 0
  	struct iscsi_endpoint *ep;
- 	struct sockaddr *dst_addr;
  	int rc = 0;
-@@ -1345,6 +1349,8 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,
+ 
+@@ -1340,6 +1344,8 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,
  		break;
  	}
  	return rc;
@@ -679,7 +669,7 @@ index 4781d81..3b6c16d 100644
  }
  
  static int
-@@ -1426,6 +1432,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -1421,6 +1427,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
  					      ev->u.c_session.queue_depth);
  		break;
  	case ISCSI_UEVENT_CREATE_BOUND_SESSION:
@@ -689,7 +679,7 @@ index 4781d81..3b6c16d 100644
  		ep = iscsi_lookup_endpoint(ev->u.c_bound_session.ep_handle);
  		if (!ep) {
  			err = -EINVAL;
-@@ -1437,6 +1446,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -1432,6 +1441,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
  					ev->u.c_bound_session.cmds_max,
  					ev->u.c_bound_session.queue_depth);
  		break;
@@ -697,7 +687,7 @@ index 4781d81..3b6c16d 100644
  	case ISCSI_UEVENT_DESTROY_SESSION:
  		session = iscsi_session_lookup(ev->u.d_session.sid);
  		if (session)
-@@ -1566,8 +1576,11 @@ iscsi_if_rx(struct sk_buff *skb)
+@@ -1563,8 +1573,11 @@ iscsi_if_rx(struct sk_buff *skb)
  	mutex_unlock(&rx_queue_mutex);
  }
  
@@ -710,7 +700,7 @@ index 4781d81..3b6c16d 100644
  	__ATTR(_name,_mode,_show,_store)
  
  /*
-@@ -1575,10 +1588,9 @@ struct device_attribute dev_attr_##_prefix##_##_name =	\
+@@ -1572,10 +1585,9 @@ struct device_attribute dev_attr_##_prefix##_##_name =	\
   */
  #define iscsi_conn_attr_show(param)					\
  static ssize_t								\
@@ -723,7 +713,7 @@ index 4781d81..3b6c16d 100644
  	struct iscsi_transport *t = conn->transport;			\
  	return t->get_conn_param(conn, param, buf);			\
  }
-@@ -1602,16 +1614,17 @@ iscsi_conn_attr(address, ISCSI_PARAM_CONN_ADDRESS);
+@@ -1599,16 +1611,17 @@ iscsi_conn_attr(address, ISCSI_PARAM_CONN_ADDRESS);
  iscsi_conn_attr(ping_tmo, ISCSI_PARAM_PING_TMO);
  iscsi_conn_attr(recv_tmo, ISCSI_PARAM_RECV_TMO);
  
@@ -745,7 +735,7 @@ index 4781d81..3b6c16d 100644
  	struct iscsi_transport *t = session->transport;			\
  									\
  	if (perm && !capable(CAP_SYS_ADMIN))				\
-@@ -1645,10 +1658,9 @@ iscsi_session_attr(ifacename, ISCSI_PARAM_IFACE_NAME, 0);
+@@ -1642,10 +1655,9 @@ iscsi_session_attr(ifacename, ISCSI_PARAM_IFACE_NAME, 0);
  iscsi_session_attr(initiatorname, ISCSI_PARAM_INITIATOR_NAME, 0)
  
  static ssize_t
@@ -758,7 +748,7 @@ index 4781d81..3b6c16d 100644
  	return sprintf(buf, "%s\n", iscsi_session_state_name(session->state));
  }
  static ISCSI_CLASS_ATTR(priv_sess, state, S_IRUGO, show_priv_session_state,
-@@ -1656,11 +1668,9 @@ static ISCSI_CLASS_ATTR(priv_sess, state, S_IRUGO, show_priv_session_state,
+@@ -1653,11 +1665,9 @@ static ISCSI_CLASS_ATTR(priv_sess, state, S_IRUGO, show_priv_session_state,
  
  #define iscsi_priv_session_attr_show(field, format)			\
  static ssize_t								\
@@ -772,7 +762,7 @@ index 4781d81..3b6c16d 100644
  	return sprintf(buf, format"\n", session->field);		\
  }
  
-@@ -1675,10 +1685,9 @@ iscsi_priv_session_attr(recovery_tmo, "%d");
+@@ -1672,10 +1682,9 @@ iscsi_priv_session_attr(recovery_tmo, "%d");
   */
  #define iscsi_host_attr_show(param)					\
  static ssize_t								\
@@ -785,7 +775,7 @@ index 4781d81..3b6c16d 100644
  	struct iscsi_internal *priv = to_iscsi_internal(shost->transportt); \
  	return priv->iscsi_transport->get_host_param(shost, param, buf); \
  }
-@@ -1695,7 +1704,7 @@ iscsi_host_attr(initiatorname, ISCSI_HOST_PARAM_INITIATOR_NAME);
+@@ -1692,7 +1701,7 @@ iscsi_host_attr(initiatorname, ISCSI_HOST_PARAM_INITIATOR_NAME);
  
  #define SETUP_PRIV_SESSION_RD_ATTR(field)				\
  do {									\
@@ -794,7 +784,7 @@ index 4781d81..3b6c16d 100644
  	count++;							\
  } while (0)
  
-@@ -1703,7 +1712,7 @@ do {									\
+@@ -1700,7 +1709,7 @@ do {									\
  #define SETUP_SESSION_RD_ATTR(field, param_flag)			\
  do {									\
  	if (tt->param_mask & param_flag) {				\
@@ -803,7 +793,7 @@ index 4781d81..3b6c16d 100644
  		count++;						\
  	}								\
  } while (0)
-@@ -1711,7 +1720,7 @@ do {									\
+@@ -1708,7 +1717,7 @@ do {									\
  #define SETUP_CONN_RD_ATTR(field, param_flag)				\
  do {									\
  	if (tt->param_mask & param_flag) {				\
@@ -812,7 +802,7 @@ index 4781d81..3b6c16d 100644
  		count++;						\
  	}								\
  } while (0)
-@@ -1719,7 +1728,7 @@ do {									\
+@@ -1716,7 +1725,7 @@ do {									\
  #define SETUP_HOST_RD_ATTR(field, param_flag)				\
  do {									\
  	if (tt->host_param_mask & param_flag) {				\
@@ -821,9 +811,9 @@ index 4781d81..3b6c16d 100644
  		count++;						\
  	}								\
  } while (0)
-@@ -1812,15 +1821,15 @@ iscsi_register_transport(struct iscsi_transport *tt)
- 	if (!(tt->caps & CAP_DATA_PATH_OFFLOAD))
- 		priv->t.create_work_queue = 1;
+@@ -1808,15 +1817,15 @@ iscsi_register_transport(struct iscsi_transport *tt)
+ 	priv->t.user_scan = iscsi_user_scan;
+ 	priv->t.create_work_queue = 1;
  
 -	priv->dev.class = &iscsi_transport_class;
 -	dev_set_name(&priv->dev, "%s", tt->name);
@@ -842,7 +832,7 @@ index 4781d81..3b6c16d 100644
  
  	/* host parameters */
  	priv->t.host_attrs.ac.attrs = &priv->host_attrs[0];
-@@ -1899,9 +1908,8 @@ iscsi_register_transport(struct iscsi_transport *tt)
+@@ -1895,9 +1904,8 @@ iscsi_register_transport(struct iscsi_transport *tt)
  	printk(KERN_NOTICE "iscsi: registered transport (%s)\n", tt->name);
  	return &priv->t;
  
@@ -854,7 +844,7 @@ index 4781d81..3b6c16d 100644
  free_priv:
  	kfree(priv);
  	return NULL;
-@@ -1928,8 +1936,8 @@ int iscsi_unregister_transport(struct iscsi_transport *tt)
+@@ -1924,8 +1932,8 @@ int iscsi_unregister_transport(struct iscsi_transport *tt)
  	transport_container_unregister(&priv->session_cont);
  	transport_container_unregister(&priv->t.host_attrs);
  
@@ -865,7 +855,7 @@ index 4781d81..3b6c16d 100644
  	mutex_unlock(&rx_queue_mutex);
  
  	return 0;
-@@ -1949,13 +1957,14 @@ static __init int iscsi_transport_init(void)
+@@ -1945,13 +1953,14 @@ static __init int iscsi_transport_init(void)
  	if (err)
  		return err;
  
@@ -882,7 +872,7 @@ index 4781d81..3b6c16d 100644
  
  	err = transport_class_register(&iscsi_connection_class);
  	if (err)
-@@ -1986,8 +1995,10 @@ unregister_conn_class:
+@@ -1982,8 +1991,10 @@ unregister_conn_class:
  	transport_class_unregister(&iscsi_connection_class);
  unregister_host_class:
  	transport_class_unregister(&iscsi_host_class);
@@ -893,7 +883,7 @@ index 4781d81..3b6c16d 100644
  unregister_transport_class:
  	class_unregister(&iscsi_transport_class);
  	return err;
-@@ -2000,7 +2011,9 @@ static void __exit iscsi_transport_exit(void)
+@@ -1996,7 +2007,9 @@ static void __exit iscsi_transport_exit(void)
  	transport_class_unregister(&iscsi_connection_class);
  	transport_class_unregister(&iscsi_session_class);
  	transport_class_unregister(&iscsi_host_class);
@@ -904,7 +894,7 @@ index 4781d81..3b6c16d 100644
  }
  
 diff --git a/scsi_transport_iscsi.h b/scsi_transport_iscsi.h
-index 27d067a..41a54c8 100644
+index 6beea23..d509d17 100644
 --- a/scsi_transport_iscsi.h
 +++ b/scsi_transport_iscsi.h
 @@ -28,6 +28,8 @@
@@ -917,5 +907,5 @@ index 27d067a..41a54c8 100644
  struct iscsi_transport;
  struct iscsi_endpoint;
 -- 
-1.6.0.4
+1.5.2.1