Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / scsi / scsi_transport_iscsi.c
index 8bb8222..5569fdc 100644 (file)
@@ -1,8 +1,10 @@
-/* 
+/*
  * iSCSI transport class definitions
  *
  * Copyright (C) IBM Corporation, 2004
- * Copyright (C) Mike Christie, 2004
+ * Copyright (C) Mike Christie, 2004 - 2005
+ * Copyright (C) Dmitry Yusupov, 2004 - 2005
+ * Copyright (C) Alex Aizman, 2004 - 2005
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <linux/module.h>
+#include <linux/mempool.h>
+#include <linux/mutex.h>
+#include <net/tcp.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_iscsi.h>
+#include <scsi/iscsi_if.h>
 
-#define ISCSI_SESSION_ATTRS 20
-#define ISCSI_HOST_ATTRS 2
+#define ISCSI_SESSION_ATTRS 11
+#define ISCSI_CONN_ATTRS 11
+#define ISCSI_HOST_ATTRS 0
 
 struct iscsi_internal {
+       int daemon_pid;
        struct scsi_transport_template t;
-       struct iscsi_function_template *fnt;
-       /*
-        * We do not have any private or other attrs.
-        */
-       struct class_device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
+       struct iscsi_transport *iscsi_transport;
+       struct list_head list;
+       struct class_device cdev;
+
        struct class_device_attribute *host_attrs[ISCSI_HOST_ATTRS + 1];
+       struct transport_container conn_cont;
+       struct class_device_attribute *conn_attrs[ISCSI_CONN_ATTRS + 1];
+       struct transport_container session_cont;
+       struct class_device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
+};
+
+static int iscsi_session_nr;   /* sysfs session id for next new session */
+
+/*
+ * list of registered transports and lock that must
+ * be held while accessing list. The iscsi_transport_lock must
+ * be acquired after the rx_queue_mutex.
+ */
+static LIST_HEAD(iscsi_transports);
+static DEFINE_SPINLOCK(iscsi_transport_lock);
+
+#define to_iscsi_internal(tmpl) \
+       container_of(tmpl, struct iscsi_internal, t)
+
+#define cdev_to_iscsi_internal(_cdev) \
+       container_of(_cdev, struct iscsi_internal, cdev)
+
+static void iscsi_transport_release(struct class_device *cdev)
+{
+       struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);
+       kfree(priv);
+}
+
+/*
+ * iscsi_transport_class represents the iscsi_transports that are
+ * registered.
+ */
+static struct class iscsi_transport_class = {
+       .name = "iscsi_transport",
+       .release = iscsi_transport_release,
+};
+
+static ssize_t
+show_transport_handle(struct class_device *cdev, char *buf)
+{
+       struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);
+       return sprintf(buf, "%llu\n", (unsigned long long)iscsi_handle(priv->iscsi_transport));
+}
+static CLASS_DEVICE_ATTR(handle, S_IRUGO, show_transport_handle, NULL);
+
+#define show_transport_attr(name, format)                              \
+static ssize_t                                                         \
+show_transport_##name(struct class_device *cdev, char *buf)            \
+{                                                                      \
+       struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);     \
+       return sprintf(buf, format"\n", priv->iscsi_transport->name);   \
+}                                                                      \
+static CLASS_DEVICE_ATTR(name, S_IRUGO, show_transport_##name, NULL);
+
+show_transport_attr(caps, "0x%x");
+show_transport_attr(max_lun, "%d");
+show_transport_attr(max_conn, "%d");
+show_transport_attr(max_cmd_len, "%d");
+
+static struct attribute *iscsi_transport_attrs[] = {
+       &class_device_attr_handle.attr,
+       &class_device_attr_caps.attr,
+       &class_device_attr_max_lun.attr,
+       &class_device_attr_max_conn.attr,
+       &class_device_attr_max_cmd_len.attr,
+       NULL,
+};
+
+static struct attribute_group iscsi_transport_group = {
+       .attrs = iscsi_transport_attrs,
 };
 
-#define to_iscsi_internal(tmpl) container_of(tmpl, struct iscsi_internal, t)
+static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
+                           struct class_device *cdev)
+{
+       struct Scsi_Host *shost = dev_to_shost(dev);
+       struct iscsi_host *ihost = shost->shost_data;
+
+       memset(ihost, 0, sizeof(*ihost));
+       INIT_LIST_HEAD(&ihost->sessions);
+       mutex_init(&ihost->mutex);
+       return 0;
+}
+
+static DECLARE_TRANSPORT_CLASS(iscsi_host_class,
+                              "iscsi_host",
+                              iscsi_setup_host,
+                              NULL,
+                              NULL);
 
-static DECLARE_TRANSPORT_CLASS(iscsi_transport_class,
-                              "iscsi_transport",
+static DECLARE_TRANSPORT_CLASS(iscsi_session_class,
+                              "iscsi_session",
                               NULL,
                               NULL,
                               NULL);
 
-static DECLARE_TRANSPORT_CLASS(iscsi_host_class,
-                              "iscsi_host",
+static DECLARE_TRANSPORT_CLASS(iscsi_connection_class,
+                              "iscsi_connection",
                               NULL,
                               NULL,
                               NULL);
+
+static struct sock *nls;
+static DEFINE_MUTEX(rx_queue_mutex);
+
+struct mempool_zone {
+       mempool_t *pool;
+       atomic_t allocated;
+       int size;
+       int hiwat;
+       struct list_head freequeue;
+       spinlock_t freelock;
+};
+
+static struct mempool_zone *z_reply;
+
 /*
- * iSCSI target and session attrs
+ * Z_MAX_* - actual mempool size allocated at the mempool_zone_init() time
+ * Z_HIWAT_* - zone's high watermark when if_error bit will be set to -ENOMEM
+ *             so daemon will notice OOM on NETLINK tranposrt level and will
+ *             be able to predict or change operational behavior
  */
-#define iscsi_session_show_fn(field, format)                           \
-                                                                       \
-static ssize_t                                                         \
-show_session_##field(struct class_device *cdev, char *buf)             \
-{                                                                      \
-       struct scsi_target *starget = transport_class_to_starget(cdev); \
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);    \
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt); \
-                                                                       \
-       if (i->fnt->get_##field)                                        \
-               i->fnt->get_##field(starget);                           \
-       return snprintf(buf, 20, format"\n", iscsi_##field(starget));   \
+#define Z_MAX_REPLY    8
+#define Z_HIWAT_REPLY  6
+#define Z_MAX_PDU      8
+#define Z_HIWAT_PDU    6
+#define Z_MAX_ERROR    16
+#define Z_HIWAT_ERROR  12
+
+static LIST_HEAD(sesslist);
+static DEFINE_SPINLOCK(sesslock);
+static LIST_HEAD(connlist);
+static DEFINE_SPINLOCK(connlock);
+
+static uint32_t iscsi_conn_get_sid(struct iscsi_cls_conn *conn)
+{
+       struct iscsi_cls_session *sess = iscsi_dev_to_session(conn->dev.parent);
+       return sess->sid;
 }
 
-#define iscsi_session_rd_attr(field, format)                           \
-       iscsi_session_show_fn(field, format)                            \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_session_##field, NULL);
+/*
+ * Returns the matching session to a given sid
+ */
+static struct iscsi_cls_session *iscsi_session_lookup(uint32_t sid)
+{
+       unsigned long flags;
+       struct iscsi_cls_session *sess;
 
-iscsi_session_rd_attr(tpgt, "%hu");
-iscsi_session_rd_attr(tsih, "%2x");
-iscsi_session_rd_attr(max_recv_data_segment_len, "%u");
-iscsi_session_rd_attr(max_burst_len, "%u");
-iscsi_session_rd_attr(first_burst_len, "%u");
-iscsi_session_rd_attr(def_time2wait, "%hu");
-iscsi_session_rd_attr(def_time2retain, "%hu");
-iscsi_session_rd_attr(max_outstanding_r2t, "%hu");
-iscsi_session_rd_attr(erl, "%d");
+       spin_lock_irqsave(&sesslock, flags);
+       list_for_each_entry(sess, &sesslist, sess_list) {
+               if (sess->sid == sid) {
+                       spin_unlock_irqrestore(&sesslock, flags);
+                       return sess;
+               }
+       }
+       spin_unlock_irqrestore(&sesslock, flags);
+       return NULL;
+}
 
+/*
+ * Returns the matching connection to a given sid / cid tuple
+ */
+static struct iscsi_cls_conn *iscsi_conn_lookup(uint32_t sid, uint32_t cid)
+{
+       unsigned long flags;
+       struct iscsi_cls_conn *conn;
 
-#define iscsi_session_show_bool_fn(field)                              \
-                                                                       \
-static ssize_t                                                         \
-show_session_bool_##field(struct class_device *cdev, char *buf)                \
-{                                                                      \
-       struct scsi_target *starget = transport_class_to_starget(cdev); \
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);    \
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt); \
-                                                                       \
-       if (i->fnt->get_##field)                                        \
-               i->fnt->get_##field(starget);                           \
-                                                                       \
-       if (iscsi_##field(starget))                                     \
-               return sprintf(buf, "Yes\n");                           \
-       return sprintf(buf, "No\n");                                    \
+       spin_lock_irqsave(&connlock, flags);
+       list_for_each_entry(conn, &connlist, conn_list) {
+               if ((conn->cid == cid) && (iscsi_conn_get_sid(conn) == sid)) {
+                       spin_unlock_irqrestore(&connlock, flags);
+                       return conn;
+               }
+       }
+       spin_unlock_irqrestore(&connlock, flags);
+       return NULL;
 }
 
-#define iscsi_session_rd_bool_attr(field)                              \
-       iscsi_session_show_bool_fn(field)                               \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_session_bool_##field, NULL);
+/*
+ * The following functions can be used by LLDs that allocate
+ * their own scsi_hosts or by software iscsi LLDs
+ */
+static void iscsi_session_release(struct device *dev)
+{
+       struct iscsi_cls_session *session = iscsi_dev_to_session(dev);
+       struct iscsi_transport *transport = session->transport;
+       struct Scsi_Host *shost;
 
-iscsi_session_rd_bool_attr(initial_r2t);
-iscsi_session_rd_bool_attr(immediate_data);
-iscsi_session_rd_bool_attr(data_pdu_in_order);
-iscsi_session_rd_bool_attr(data_sequence_in_order);
+       shost = iscsi_session_to_shost(session);
+       scsi_host_put(shost);
+       kfree(session->targetname);
+       kfree(session);
+       module_put(transport->owner);
+}
 
-#define iscsi_session_show_digest_fn(field)                            \
-                                                                       \
-static ssize_t                                                         \
-show_##field(struct class_device *cdev, char *buf)                     \
-{                                                                      \
-       struct scsi_target *starget = transport_class_to_starget(cdev); \
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);    \
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt); \
-                                                                       \
-       if (i->fnt->get_##field)                                        \
-               i->fnt->get_##field(starget);                           \
-                                                                       \
-       if (iscsi_##field(starget))                                     \
-               return sprintf(buf, "CRC32C\n");                        \
-       return sprintf(buf, "None\n");                                  \
+static int iscsi_is_session_dev(const struct device *dev)
+{
+       return dev->release == iscsi_session_release;
 }
 
-#define iscsi_session_rd_digest_attr(field)                            \
-       iscsi_session_show_digest_fn(field)                             \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
+static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
+                          uint id, uint lun)
+{
+       struct iscsi_host *ihost = shost->shost_data;
+       struct iscsi_cls_session *session;
 
-iscsi_session_rd_digest_attr(header_digest);
-iscsi_session_rd_digest_attr(data_digest);
+       mutex_lock(&ihost->mutex);
+       list_for_each_entry(session, &ihost->sessions, host_list) {
+               if ((channel == SCAN_WILD_CARD ||
+                    channel == session->channel) &&
+                   (id == SCAN_WILD_CARD || id == session->target_id))
+                       scsi_scan_target(&session->dev, session->channel,
+                                        session->target_id, lun, 1);
+       }
+       mutex_unlock(&ihost->mutex);
 
-static ssize_t
-show_port(struct class_device *cdev, char *buf)
+       return 0;
+}
+
+static void session_recovery_timedout(void *data)
 {
-       struct scsi_target *starget = transport_class_to_starget(cdev);
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt);
+       struct iscsi_cls_session *session = data;
+
+       dev_printk(KERN_INFO, &session->dev, "iscsi: session recovery timed "
+                 "out after %d secs\n", session->recovery_tmo);
 
-       if (i->fnt->get_port)
-               i->fnt->get_port(starget);
+       if (session->transport->session_recovery_timedout)
+               session->transport->session_recovery_timedout(session);
 
-       return snprintf(buf, 20, "%hu\n", ntohs(iscsi_port(starget)));
+       scsi_target_unblock(&session->dev);
 }
-static CLASS_DEVICE_ATTR(port, S_IRUGO, show_port, NULL);
 
-static ssize_t
-show_ip_address(struct class_device *cdev, char *buf)
+void iscsi_unblock_session(struct iscsi_cls_session *session)
+{
+       if (!cancel_delayed_work(&session->recovery_work))
+               flush_scheduled_work();
+       scsi_target_unblock(&session->dev);
+}
+EXPORT_SYMBOL_GPL(iscsi_unblock_session);
+
+void iscsi_block_session(struct iscsi_cls_session *session)
+{
+       scsi_target_block(&session->dev);
+       schedule_delayed_work(&session->recovery_work,
+                            session->recovery_tmo * HZ);
+}
+EXPORT_SYMBOL_GPL(iscsi_block_session);
+
+/**
+ * iscsi_create_session - create iscsi class session
+ * @shost: scsi host
+ * @transport: iscsi transport
+ *
+ * This can be called from a LLD or iscsi_transport.
+ **/
+struct iscsi_cls_session *
+iscsi_create_session(struct Scsi_Host *shost,
+                    struct iscsi_transport *transport, int channel)
+{
+       struct iscsi_host *ihost;
+       struct iscsi_cls_session *session;
+       int err;
+
+       if (!try_module_get(transport->owner))
+               return NULL;
+
+       session = kzalloc(sizeof(*session) + transport->sessiondata_size,
+                         GFP_KERNEL);
+       if (!session)
+               goto module_put;
+       session->transport = transport;
+       session->recovery_tmo = 120;
+       INIT_WORK(&session->recovery_work, session_recovery_timedout, session);
+       INIT_LIST_HEAD(&session->host_list);
+       INIT_LIST_HEAD(&session->sess_list);
+
+       if (transport->sessiondata_size)
+               session->dd_data = &session[1];
+
+       /* this is released in the dev's release function */
+       scsi_host_get(shost);
+       ihost = shost->shost_data;
+
+       session->sid = iscsi_session_nr++;
+       session->channel = channel;
+       session->target_id = ihost->next_target_id++;
+
+       snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u",
+                session->sid);
+       session->dev.parent = &shost->shost_gendev;
+       session->dev.release = iscsi_session_release;
+       err = device_register(&session->dev);
+       if (err) {
+               dev_printk(KERN_ERR, &session->dev, "iscsi: could not "
+                          "register session's dev\n");
+               goto free_session;
+       }
+       transport_register_device(&session->dev);
+
+       mutex_lock(&ihost->mutex);
+       list_add(&session->host_list, &ihost->sessions);
+       mutex_unlock(&ihost->mutex);
+
+       return session;
+
+free_session:
+       kfree(session);
+module_put:
+       module_put(transport->owner);
+       return NULL;
+}
+
+EXPORT_SYMBOL_GPL(iscsi_create_session);
+
+/**
+ * iscsi_destroy_session - destroy iscsi session
+ * @session: iscsi_session
+ *
+ * Can be called by a LLD or iscsi_transport. There must not be
+ * any running connections.
+ **/
+int iscsi_destroy_session(struct iscsi_cls_session *session)
 {
-       struct scsi_target *starget = transport_class_to_starget(cdev);
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt);
+       struct Scsi_Host *shost = iscsi_session_to_shost(session);
+       struct iscsi_host *ihost = shost->shost_data;
 
-       if (i->fnt->get_ip_address)
-               i->fnt->get_ip_address(starget);
+       if (!cancel_delayed_work(&session->recovery_work))
+               flush_scheduled_work();
 
-       if (iscsi_addr_type(starget) == AF_INET)
-               return sprintf(buf, "%u.%u.%u.%u\n",
-                              NIPQUAD(iscsi_sin_addr(starget)));
-       else if(iscsi_addr_type(starget) == AF_INET6)
-               return sprintf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-                              NIP6(iscsi_sin6_addr(starget)));
-       return -EINVAL;
+       mutex_lock(&ihost->mutex);
+       list_del(&session->host_list);
+       mutex_unlock(&ihost->mutex);
+
+       transport_unregister_device(&session->dev);
+       device_unregister(&session->dev);
+       return 0;
 }
-static CLASS_DEVICE_ATTR(ip_address, S_IRUGO, show_ip_address, NULL);
 
-static ssize_t
-show_isid(struct class_device *cdev, char *buf)
+EXPORT_SYMBOL_GPL(iscsi_destroy_session);
+
+static void iscsi_conn_release(struct device *dev)
+{
+       struct iscsi_cls_conn *conn = iscsi_dev_to_conn(dev);
+       struct device *parent = conn->dev.parent;
+
+       kfree(conn->persistent_address);
+       kfree(conn);
+       put_device(parent);
+}
+
+static int iscsi_is_conn_dev(const struct device *dev)
+{
+       return dev->release == iscsi_conn_release;
+}
+
+/**
+ * iscsi_create_conn - create iscsi class connection
+ * @session: iscsi cls session
+ * @cid: connection id
+ *
+ * This can be called from a LLD or iscsi_transport. The connection
+ * is child of the session so cid must be unique for all connections
+ * on the session.
+ *
+ * Since we do not support MCS, cid will normally be zero. In some cases
+ * for software iscsi we could be trying to preallocate a connection struct
+ * in which case there could be two connection structs and cid would be
+ * non-zero.
+ **/
+struct iscsi_cls_conn *
+iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)
 {
-       struct scsi_target *starget = transport_class_to_starget(cdev);
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt);
+       struct iscsi_transport *transport = session->transport;
+       struct iscsi_cls_conn *conn;
+       int err;
 
-       if (i->fnt->get_isid)
-               i->fnt->get_isid(starget);
+       conn = kzalloc(sizeof(*conn) + transport->conndata_size, GFP_KERNEL);
+       if (!conn)
+               return NULL;
+
+       if (transport->conndata_size)
+               conn->dd_data = &conn[1];
+
+       INIT_LIST_HEAD(&conn->conn_list);
+       conn->transport = transport;
+       conn->cid = cid;
+
+       /* this is released in the dev's release function */
+       if (!get_device(&session->dev))
+               goto free_conn;
+
+       snprintf(conn->dev.bus_id, BUS_ID_SIZE, "connection%d:%u",
+                session->sid, cid);
+       conn->dev.parent = &session->dev;
+       conn->dev.release = iscsi_conn_release;
+       err = device_register(&conn->dev);
+       if (err) {
+               dev_printk(KERN_ERR, &conn->dev, "iscsi: could not register "
+                          "connection's dev\n");
+               goto release_parent_ref;
+       }
+       transport_register_device(&conn->dev);
+       return conn;
 
-       return sprintf(buf, "%02x%02x%02x%02x%02x%02x\n",
-                      iscsi_isid(starget)[0], iscsi_isid(starget)[1],
-                      iscsi_isid(starget)[2], iscsi_isid(starget)[3],
-                      iscsi_isid(starget)[4], iscsi_isid(starget)[5]);
+release_parent_ref:
+       put_device(&session->dev);
+free_conn:
+       kfree(conn);
+       return NULL;
 }
-static CLASS_DEVICE_ATTR(isid, S_IRUGO, show_isid, NULL);
+
+EXPORT_SYMBOL_GPL(iscsi_create_conn);
+
+/**
+ * iscsi_destroy_conn - destroy iscsi class connection
+ * @session: iscsi cls session
+ *
+ * This can be called from a LLD or iscsi_transport.
+ **/
+int iscsi_destroy_conn(struct iscsi_cls_conn *conn)
+{
+       transport_unregister_device(&conn->dev);
+       device_unregister(&conn->dev);
+       return 0;
+}
+
+EXPORT_SYMBOL_GPL(iscsi_destroy_conn);
 
 /*
- * This is used for iSCSI names. Normally, we follow
- * the transport class convention of having the lld
- * set the field, but in these cases the value is
- * too large.
+ * iscsi interface functions
  */
-#define iscsi_session_show_str_fn(field)                               \
-                                                                       \
+static struct iscsi_internal *
+iscsi_if_transport_lookup(struct iscsi_transport *tt)
+{
+       struct iscsi_internal *priv;
+       unsigned long flags;
+
+       spin_lock_irqsave(&iscsi_transport_lock, flags);
+       list_for_each_entry(priv, &iscsi_transports, list) {
+               if (tt == priv->iscsi_transport) {
+                       spin_unlock_irqrestore(&iscsi_transport_lock, flags);
+                       return priv;
+               }
+       }
+       spin_unlock_irqrestore(&iscsi_transport_lock, flags);
+       return NULL;
+}
+
+static inline struct list_head *skb_to_lh(struct sk_buff *skb)
+{
+       return (struct list_head *)&skb->cb;
+}
+
+static void*
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
+{
+       struct mempool_zone *zone = pool_data;
+
+       return alloc_skb(zone->size, gfp_mask);
+}
+
+static void
+mempool_zone_free_skb(void *element, void *pool_data)
+{
+       kfree_skb(element);
+}
+
+static void
+mempool_zone_complete(struct mempool_zone *zone)
+{
+       unsigned long flags;
+       struct list_head *lh, *n;
+
+       spin_lock_irqsave(&zone->freelock, flags);
+       list_for_each_safe(lh, n, &zone->freequeue) {
+               struct sk_buff *skb = (struct sk_buff *)((char *)lh -
+                               offsetof(struct sk_buff, cb));
+               if (!skb_shared(skb)) {
+                       list_del(skb_to_lh(skb));
+                       mempool_free(skb, zone->pool);
+                       atomic_dec(&zone->allocated);
+               }
+       }
+       spin_unlock_irqrestore(&zone->freelock, flags);
+}
+
+static struct mempool_zone *
+mempool_zone_init(unsigned max, unsigned size, unsigned hiwat)
+{
+       struct mempool_zone *zp;
+
+       zp = kzalloc(sizeof(*zp), GFP_KERNEL);
+       if (!zp)
+               return NULL;
+
+       zp->size = size;
+       zp->hiwat = hiwat;
+       INIT_LIST_HEAD(&zp->freequeue);
+       spin_lock_init(&zp->freelock);
+       atomic_set(&zp->allocated, 0);
+
+       zp->pool = mempool_create(max, mempool_zone_alloc_skb,
+                                 mempool_zone_free_skb, zp);
+       if (!zp->pool) {
+               kfree(zp);
+               return NULL;
+       }
+
+       return zp;
+}
+
+static void mempool_zone_destroy(struct mempool_zone *zp)
+{
+       mempool_destroy(zp->pool);
+       kfree(zp);
+}
+
+static struct sk_buff*
+mempool_zone_get_skb(struct mempool_zone *zone)
+{
+       struct sk_buff *skb;
+
+       skb = mempool_alloc(zone->pool, GFP_ATOMIC);
+       if (skb)
+               atomic_inc(&zone->allocated);
+       return skb;
+}
+
+static int
+iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb, int pid)
+{
+       unsigned long flags;
+       int rc;
+
+       skb_get(skb);
+       rc = netlink_unicast(nls, skb, pid, MSG_DONTWAIT);
+       if (rc < 0) {
+               mempool_free(skb, zone->pool);
+               printk(KERN_ERR "iscsi: can not unicast skb (%d)\n", rc);
+               return rc;
+       }
+
+       spin_lock_irqsave(&zone->freelock, flags);
+       INIT_LIST_HEAD(skb_to_lh(skb));
+       list_add(skb_to_lh(skb), &zone->freequeue);
+       spin_unlock_irqrestore(&zone->freelock, flags);
+
+       return 0;
+}
+
+int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
+                  char *data, uint32_t data_size)
+{
+       struct nlmsghdr *nlh;
+       struct sk_buff *skb;
+       struct iscsi_uevent *ev;
+       char *pdu;
+       struct iscsi_internal *priv;
+       int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) +
+                             data_size);
+
+       priv = iscsi_if_transport_lookup(conn->transport);
+       if (!priv)
+               return -EINVAL;
+
+       mempool_zone_complete(conn->z_pdu);
+
+       skb = mempool_zone_get_skb(conn->z_pdu);
+       if (!skb) {
+               iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED);
+               dev_printk(KERN_ERR, &conn->dev, "iscsi: can not deliver "
+                          "control PDU: OOM\n");
+               return -ENOMEM;
+       }
+
+       nlh = __nlmsg_put(skb, priv->daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);
+       ev = NLMSG_DATA(nlh);
+       memset(ev, 0, sizeof(*ev));
+       ev->transport_handle = iscsi_handle(conn->transport);
+       ev->type = ISCSI_KEVENT_RECV_PDU;
+       if (atomic_read(&conn->z_pdu->allocated) >= conn->z_pdu->hiwat)
+               ev->iferror = -ENOMEM;
+       ev->r.recv_req.cid = conn->cid;
+       ev->r.recv_req.sid = iscsi_conn_get_sid(conn);
+       pdu = (char*)ev + sizeof(*ev);
+       memcpy(pdu, hdr, sizeof(struct iscsi_hdr));
+       memcpy(pdu + sizeof(struct iscsi_hdr), data, data_size);
+
+       return iscsi_unicast_skb(conn->z_pdu, skb, priv->daemon_pid);
+}
+EXPORT_SYMBOL_GPL(iscsi_recv_pdu);
+
+void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)
+{
+       struct nlmsghdr *nlh;
+       struct sk_buff  *skb;
+       struct iscsi_uevent *ev;
+       struct iscsi_internal *priv;
+       int len = NLMSG_SPACE(sizeof(*ev));
+
+       priv = iscsi_if_transport_lookup(conn->transport);
+       if (!priv)
+               return;
+
+       mempool_zone_complete(conn->z_error);
+
+       skb = mempool_zone_get_skb(conn->z_error);
+       if (!skb) {
+               dev_printk(KERN_ERR, &conn->dev, "iscsi: gracefully ignored "
+                         "conn error (%d)\n", error);
+               return;
+       }
+
+       nlh = __nlmsg_put(skb, priv->daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);
+       ev = NLMSG_DATA(nlh);
+       ev->transport_handle = iscsi_handle(conn->transport);
+       ev->type = ISCSI_KEVENT_CONN_ERROR;
+       if (atomic_read(&conn->z_error->allocated) >= conn->z_error->hiwat)
+               ev->iferror = -ENOMEM;
+       ev->r.connerror.error = error;
+       ev->r.connerror.cid = conn->cid;
+       ev->r.connerror.sid = iscsi_conn_get_sid(conn);
+
+       iscsi_unicast_skb(conn->z_error, skb, priv->daemon_pid);
+
+       dev_printk(KERN_INFO, &conn->dev, "iscsi: detected conn error (%d)\n",
+                  error);
+}
+EXPORT_SYMBOL_GPL(iscsi_conn_error);
+
+static int
+iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
+                     void *payload, int size)
+{
+       struct sk_buff  *skb;
+       struct nlmsghdr *nlh;
+       int len = NLMSG_SPACE(size);
+       int flags = multi ? NLM_F_MULTI : 0;
+       int t = done ? NLMSG_DONE : type;
+
+       mempool_zone_complete(z_reply);
+
+       skb = mempool_zone_get_skb(z_reply);
+       /*
+        * FIXME:
+        * user is supposed to react on iferror == -ENOMEM;
+        * see iscsi_if_rx().
+        */
+       BUG_ON(!skb);
+
+       nlh = __nlmsg_put(skb, pid, seq, t, (len - sizeof(*nlh)), 0);
+       nlh->nlmsg_flags = flags;
+       memcpy(NLMSG_DATA(nlh), payload, size);
+       return iscsi_unicast_skb(z_reply, skb, pid);
+}
+
+static int
+iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
+{
+       struct iscsi_uevent *ev = NLMSG_DATA(nlh);
+       struct iscsi_stats *stats;
+       struct sk_buff *skbstat;
+       struct iscsi_cls_conn *conn;
+       struct nlmsghdr *nlhstat;
+       struct iscsi_uevent *evstat;
+       struct iscsi_internal *priv;
+       int len = NLMSG_SPACE(sizeof(*ev) +
+                             sizeof(struct iscsi_stats) +
+                             sizeof(struct iscsi_stats_custom) *
+                             ISCSI_STATS_CUSTOM_MAX);
+       int err = 0;
+
+       priv = iscsi_if_transport_lookup(transport);
+       if (!priv)
+               return -EINVAL;
+
+       conn = iscsi_conn_lookup(ev->u.get_stats.sid, ev->u.get_stats.cid);
+       if (!conn)
+               return -EEXIST;
+
+       do {
+               int actual_size;
+
+               mempool_zone_complete(conn->z_pdu);
+
+               skbstat = mempool_zone_get_skb(conn->z_pdu);
+               if (!skbstat) {
+                       dev_printk(KERN_ERR, &conn->dev, "iscsi: can not "
+                                  "deliver stats: OOM\n");
+                       return -ENOMEM;
+               }
+
+               nlhstat = __nlmsg_put(skbstat, priv->daemon_pid, 0, 0,
+                                     (len - sizeof(*nlhstat)), 0);
+               evstat = NLMSG_DATA(nlhstat);
+               memset(evstat, 0, sizeof(*evstat));
+               evstat->transport_handle = iscsi_handle(conn->transport);
+               evstat->type = nlh->nlmsg_type;
+               if (atomic_read(&conn->z_pdu->allocated) >= conn->z_pdu->hiwat)
+                       evstat->iferror = -ENOMEM;
+               evstat->u.get_stats.cid =
+                       ev->u.get_stats.cid;
+               evstat->u.get_stats.sid =
+                       ev->u.get_stats.sid;
+               stats = (struct iscsi_stats *)
+                       ((char*)evstat + sizeof(*evstat));
+               memset(stats, 0, sizeof(*stats));
+
+               transport->get_stats(conn, stats);
+               actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) +
+                                         sizeof(struct iscsi_stats) +
+                                         sizeof(struct iscsi_stats_custom) *
+                                         stats->custom_length);
+               actual_size -= sizeof(*nlhstat);
+               actual_size = NLMSG_LENGTH(actual_size);
+               skb_trim(skbstat, NLMSG_ALIGN(actual_size));
+               nlhstat->nlmsg_len = actual_size;
+
+               err = iscsi_unicast_skb(conn->z_pdu, skbstat, priv->daemon_pid);
+       } while (err < 0 && err != -ECONNREFUSED);
+
+       return err;
+}
+
+static int
+iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_uevent *ev)
+{
+       struct iscsi_transport *transport = priv->iscsi_transport;
+       struct iscsi_cls_session *session;
+       unsigned long flags;
+       uint32_t hostno;
+
+       session = transport->create_session(transport, &priv->t,
+                                           ev->u.c_session.initial_cmdsn,
+                                           &hostno);
+       if (!session)
+               return -ENOMEM;
+
+       spin_lock_irqsave(&sesslock, flags);
+       list_add(&session->sess_list, &sesslist);
+       spin_unlock_irqrestore(&sesslock, flags);
+
+       ev->r.c_session_ret.host_no = hostno;
+       ev->r.c_session_ret.sid = session->sid;
+       return 0;
+}
+
+static int
+iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)
+{
+       struct iscsi_cls_conn *conn;
+       struct iscsi_cls_session *session;
+       unsigned long flags;
+
+       session = iscsi_session_lookup(ev->u.c_conn.sid);
+       if (!session) {
+               printk(KERN_ERR "iscsi: invalid session %d\n",
+                      ev->u.c_conn.sid);
+               return -EINVAL;
+       }
+
+       conn = transport->create_conn(session, ev->u.c_conn.cid);
+       if (!conn) {
+               printk(KERN_ERR "iscsi: couldn't create a new "
+                          "connection for session %d\n",
+                          session->sid);
+               return -ENOMEM;
+       }
+
+       conn->z_pdu = mempool_zone_init(Z_MAX_PDU,
+                       NLMSG_SPACE(sizeof(struct iscsi_uevent) +
+                                   sizeof(struct iscsi_hdr) +
+                                   DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH),
+                       Z_HIWAT_PDU);
+       if (!conn->z_pdu) {
+               dev_printk(KERN_ERR, &conn->dev, "iscsi: can not allocate "
+                          "pdu zone for new conn\n");
+               goto destroy_conn;
+       }
+
+       conn->z_error = mempool_zone_init(Z_MAX_ERROR,
+                       NLMSG_SPACE(sizeof(struct iscsi_uevent)),
+                       Z_HIWAT_ERROR);
+       if (!conn->z_error) {
+               dev_printk(KERN_ERR, &conn->dev, "iscsi: can not allocate "
+                          "error zone for new conn\n");
+               goto free_pdu_pool;
+       }
+
+       ev->r.c_conn_ret.sid = session->sid;
+       ev->r.c_conn_ret.cid = conn->cid;
+
+       spin_lock_irqsave(&connlock, flags);
+       list_add(&conn->conn_list, &connlist);
+       conn->active = 1;
+       spin_unlock_irqrestore(&connlock, flags);
+
+       return 0;
+
+free_pdu_pool:
+       mempool_zone_destroy(conn->z_pdu);
+destroy_conn:
+       if (transport->destroy_conn)
+               transport->destroy_conn(conn->dd_data);
+       return -ENOMEM;
+}
+
+static int
+iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)
+{
+       unsigned long flags;
+       struct iscsi_cls_conn *conn;
+       struct mempool_zone *z_error, *z_pdu;
+
+       conn = iscsi_conn_lookup(ev->u.d_conn.sid, ev->u.d_conn.cid);
+       if (!conn)
+               return -EINVAL;
+       spin_lock_irqsave(&connlock, flags);
+       conn->active = 0;
+       list_del(&conn->conn_list);
+       spin_unlock_irqrestore(&connlock, flags);
+
+       z_pdu = conn->z_pdu;
+       z_error = conn->z_error;
+
+       if (transport->destroy_conn)
+               transport->destroy_conn(conn);
+
+       mempool_zone_destroy(z_pdu);
+       mempool_zone_destroy(z_error);
+
+       return 0;
+}
+
+static void
+iscsi_copy_param(struct iscsi_uevent *ev, uint32_t *value, char *data)
+{
+       if (ev->u.set_param.len != sizeof(uint32_t))
+               BUG();
+       memcpy(value, data, min_t(uint32_t, sizeof(uint32_t),
+               ev->u.set_param.len));
+}
+
+static int
+iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev)
+{
+       char *data = (char*)ev + sizeof(*ev);
+       struct iscsi_cls_conn *conn;
+       struct iscsi_cls_session *session;
+       int err = 0;
+       uint32_t value = 0;
+
+       session = iscsi_session_lookup(ev->u.set_param.sid);
+       conn = iscsi_conn_lookup(ev->u.set_param.sid, ev->u.set_param.cid);
+       if (!conn || !session)
+               return -EINVAL;
+
+       switch (ev->u.set_param.param) {
+       case ISCSI_PARAM_SESS_RECOVERY_TMO:
+               iscsi_copy_param(ev, &value, data);
+               if (value != 0)
+                       session->recovery_tmo = value;
+               break;
+       case ISCSI_PARAM_TARGET_NAME:
+               /* this should not change between logins */
+               if (session->targetname)
+                       return 0;
+
+               session->targetname = kstrdup(data, GFP_KERNEL);
+               if (!session->targetname)
+                       return -ENOMEM;
+               break;
+       case ISCSI_PARAM_TPGT:
+               iscsi_copy_param(ev, &value, data);
+               session->tpgt = value;
+               break;
+       case ISCSI_PARAM_PERSISTENT_PORT:
+               iscsi_copy_param(ev, &value, data);
+               conn->persistent_port = value;
+               break;
+       case ISCSI_PARAM_PERSISTENT_ADDRESS:
+               /*
+                * this is the address returned in discovery so it should
+                * not change between logins.
+                */
+               if (conn->persistent_address)
+                       return 0;
+
+               conn->persistent_address = kstrdup(data, GFP_KERNEL);
+               if (!conn->persistent_address)
+                       return -ENOMEM;
+               break;
+       default:
+               iscsi_copy_param(ev, &value, data);
+               err = transport->set_param(conn, ev->u.set_param.param, value);
+       }
+
+       return err;
+}
+
+static int
+iscsi_if_transport_ep(struct iscsi_transport *transport,
+                     struct iscsi_uevent *ev, int msg_type)
+{
+       struct sockaddr *dst_addr;
+       int rc = 0;
+
+       switch (msg_type) {
+       case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:
+               if (!transport->ep_connect)
+                       return -EINVAL;
+
+               dst_addr = (struct sockaddr *)((char*)ev + sizeof(*ev));
+               rc = transport->ep_connect(dst_addr,
+                                          ev->u.ep_connect.non_blocking,
+                                          &ev->r.ep_connect_ret.handle);
+               break;
+       case ISCSI_UEVENT_TRANSPORT_EP_POLL:
+               if (!transport->ep_poll)
+                       return -EINVAL;
+
+               ev->r.retcode = transport->ep_poll(ev->u.ep_poll.ep_handle,
+                                                  ev->u.ep_poll.timeout_ms);
+               break;
+       case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:
+               if (!transport->ep_disconnect)
+                       return -EINVAL;
+
+               transport->ep_disconnect(ev->u.ep_disconnect.ep_handle);
+               break;
+       }
+       return rc;
+}
+
+static int
+iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+{
+       int err = 0;
+       struct iscsi_uevent *ev = NLMSG_DATA(nlh);
+       struct iscsi_transport *transport = NULL;
+       struct iscsi_internal *priv;
+       struct iscsi_cls_session *session;
+       struct iscsi_cls_conn *conn;
+       unsigned long flags;
+
+       priv = iscsi_if_transport_lookup(iscsi_ptr(ev->transport_handle));
+       if (!priv)
+               return -EINVAL;
+       transport = priv->iscsi_transport;
+
+       if (!try_module_get(transport->owner))
+               return -EINVAL;
+
+       priv->daemon_pid = NETLINK_CREDS(skb)->pid;
+
+       switch (nlh->nlmsg_type) {
+       case ISCSI_UEVENT_CREATE_SESSION:
+               err = iscsi_if_create_session(priv, ev);
+               break;
+       case ISCSI_UEVENT_DESTROY_SESSION:
+               session = iscsi_session_lookup(ev->u.d_session.sid);
+               if (session) {
+                       spin_lock_irqsave(&sesslock, flags);
+                       list_del(&session->sess_list);
+                       spin_unlock_irqrestore(&sesslock, flags);
+
+                       transport->destroy_session(session);
+               } else
+                       err = -EINVAL;
+               break;
+       case ISCSI_UEVENT_CREATE_CONN:
+               err = iscsi_if_create_conn(transport, ev);
+               break;
+       case ISCSI_UEVENT_DESTROY_CONN:
+               err = iscsi_if_destroy_conn(transport, ev);
+               break;
+       case ISCSI_UEVENT_BIND_CONN:
+               session = iscsi_session_lookup(ev->u.b_conn.sid);
+               conn = iscsi_conn_lookup(ev->u.b_conn.sid, ev->u.b_conn.cid);
+
+               if (session && conn)
+                       ev->r.retcode = transport->bind_conn(session, conn,
+                                       ev->u.b_conn.transport_eph,
+                                       ev->u.b_conn.is_leading);
+               else
+                       err = -EINVAL;
+               break;
+       case ISCSI_UEVENT_SET_PARAM:
+               err = iscsi_set_param(transport, ev);
+               break;
+       case ISCSI_UEVENT_START_CONN:
+               conn = iscsi_conn_lookup(ev->u.start_conn.sid, ev->u.start_conn.cid);
+               if (conn)
+                       ev->r.retcode = transport->start_conn(conn);
+               else
+                       err = -EINVAL;
+               break;
+       case ISCSI_UEVENT_STOP_CONN:
+               conn = iscsi_conn_lookup(ev->u.stop_conn.sid, ev->u.stop_conn.cid);
+               if (conn)
+                       transport->stop_conn(conn, ev->u.stop_conn.flag);
+               else
+                       err = -EINVAL;
+               break;
+       case ISCSI_UEVENT_SEND_PDU:
+               conn = iscsi_conn_lookup(ev->u.send_pdu.sid, ev->u.send_pdu.cid);
+               if (conn)
+                       ev->r.retcode = transport->send_pdu(conn,
+                               (struct iscsi_hdr*)((char*)ev + sizeof(*ev)),
+                               (char*)ev + sizeof(*ev) + ev->u.send_pdu.hdr_size,
+                               ev->u.send_pdu.data_size);
+               else
+                       err = -EINVAL;
+               break;
+       case ISCSI_UEVENT_GET_STATS:
+               err = iscsi_if_get_stats(transport, nlh);
+               break;
+       case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:
+       case ISCSI_UEVENT_TRANSPORT_EP_POLL:
+       case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:
+               err = iscsi_if_transport_ep(transport, ev, nlh->nlmsg_type);
+               break;
+       default:
+               err = -EINVAL;
+               break;
+       }
+
+       module_put(transport->owner);
+       return err;
+}
+
+/*
+ * Get message from skb (based on rtnetlink_rcv_skb).  Each message is
+ * processed by iscsi_if_recv_msg.  Malformed skbs with wrong lengths or
+ * invalid creds are discarded silently.
+ */
+static void
+iscsi_if_rx(struct sock *sk, int len)
+{
+       struct sk_buff *skb;
+
+       mutex_lock(&rx_queue_mutex);
+       while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+               if (NETLINK_CREDS(skb)->uid) {
+                       skb_pull(skb, skb->len);
+                       goto free_skb;
+               }
+
+               while (skb->len >= NLMSG_SPACE(0)) {
+                       int err;
+                       uint32_t rlen;
+                       struct nlmsghdr *nlh;
+                       struct iscsi_uevent *ev;
+
+                       nlh = (struct nlmsghdr *)skb->data;
+                       if (nlh->nlmsg_len < sizeof(*nlh) ||
+                           skb->len < nlh->nlmsg_len) {
+                               break;
+                       }
+
+                       ev = NLMSG_DATA(nlh);
+                       rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+                       if (rlen > skb->len)
+                               rlen = skb->len;
+
+                       err = iscsi_if_recv_msg(skb, nlh);
+                       if (err) {
+                               ev->type = ISCSI_KEVENT_IF_ERROR;
+                               ev->iferror = err;
+                       }
+                       do {
+                               /*
+                                * special case for GET_STATS:
+                                * on success - sending reply and stats from
+                                * inside of if_recv_msg(),
+                                * on error - fall through.
+                                */
+                               if (ev->type == ISCSI_UEVENT_GET_STATS && !err)
+                                       break;
+                               err = iscsi_if_send_reply(
+                                       NETLINK_CREDS(skb)->pid, nlh->nlmsg_seq,
+                                       nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));
+                               if (atomic_read(&z_reply->allocated) >=
+                                               z_reply->hiwat)
+                                       ev->iferror = -ENOMEM;
+                       } while (err < 0 && err != -ECONNREFUSED);
+                       skb_pull(skb, rlen);
+               }
+free_skb:
+               kfree_skb(skb);
+       }
+       mutex_unlock(&rx_queue_mutex);
+}
+
+#define iscsi_cdev_to_conn(_cdev) \
+       iscsi_dev_to_conn(_cdev->dev)
+
+#define ISCSI_CLASS_ATTR(_prefix,_name,_mode,_show,_store)             \
+struct class_device_attribute class_device_attr_##_prefix##_##_name =  \
+       __ATTR(_name,_mode,_show,_store)
+
+/*
+ * iSCSI connection attrs
+ */
+#define iscsi_conn_int_attr_show(param, format)                                \
 static ssize_t                                                         \
-show_session_str_##field(struct class_device *cdev, char *buf)         \
+show_conn_int_param_##param(struct class_device *cdev, char *buf)      \
 {                                                                      \
-       ssize_t ret = 0;                                                \
-       struct scsi_target *starget = transport_class_to_starget(cdev); \
-       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);    \
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt); \
+       uint32_t value = 0;                                             \
+       struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev);         \
+       struct iscsi_transport *t = conn->transport;                    \
                                                                        \
-       if (i->fnt->get_##field)                                        \
-               ret = i->fnt->get_##field(starget, buf, PAGE_SIZE);     \
-       return ret;                                                     \
+       t->get_conn_param(conn, param, &value);                         \
+       return snprintf(buf, 20, format"\n", value);                    \
+}
+
+#define iscsi_conn_int_attr(field, param, format)                      \
+       iscsi_conn_int_attr_show(param, format)                         \
+static ISCSI_CLASS_ATTR(conn, field, S_IRUGO, show_conn_int_param_##param, \
+                       NULL);
+
+iscsi_conn_int_attr(max_recv_dlength, ISCSI_PARAM_MAX_RECV_DLENGTH, "%u");
+iscsi_conn_int_attr(max_xmit_dlength, ISCSI_PARAM_MAX_XMIT_DLENGTH, "%u");
+iscsi_conn_int_attr(header_digest, ISCSI_PARAM_HDRDGST_EN, "%d");
+iscsi_conn_int_attr(data_digest, ISCSI_PARAM_DATADGST_EN, "%d");
+iscsi_conn_int_attr(ifmarker, ISCSI_PARAM_IFMARKER_EN, "%d");
+iscsi_conn_int_attr(ofmarker, ISCSI_PARAM_OFMARKER_EN, "%d");
+iscsi_conn_int_attr(persistent_port, ISCSI_PARAM_PERSISTENT_PORT, "%d");
+iscsi_conn_int_attr(port, ISCSI_PARAM_CONN_PORT, "%d");
+iscsi_conn_int_attr(exp_statsn, ISCSI_PARAM_EXP_STATSN, "%u");
+
+#define iscsi_conn_str_attr_show(param)                                        \
+static ssize_t                                                         \
+show_conn_str_param_##param(struct class_device *cdev, char *buf)      \
+{                                                                      \
+       struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev);         \
+       struct iscsi_transport *t = conn->transport;                    \
+       return t->get_conn_str_param(conn, param, buf);                 \
 }
 
-#define iscsi_session_rd_str_attr(field)                               \
-       iscsi_session_show_str_fn(field)                                \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_session_str_##field, NULL);
+#define iscsi_conn_str_attr(field, param)                              \
+       iscsi_conn_str_attr_show(param)                                 \
+static ISCSI_CLASS_ATTR(conn, field, S_IRUGO, show_conn_str_param_##param, \
+                       NULL);
 
-iscsi_session_rd_str_attr(target_name);
-iscsi_session_rd_str_attr(target_alias);
+iscsi_conn_str_attr(persistent_address, ISCSI_PARAM_PERSISTENT_ADDRESS);
+iscsi_conn_str_attr(address, ISCSI_PARAM_CONN_ADDRESS);
+
+#define iscsi_cdev_to_session(_cdev) \
+       iscsi_dev_to_session(_cdev->dev)
 
 /*
- * iSCSI host attrs
+ * iSCSI session attrs
  */
+#define iscsi_session_int_attr_show(param, format)                     \
+static ssize_t                                                         \
+show_session_int_param_##param(struct class_device *cdev, char *buf)   \
+{                                                                      \
+       uint32_t value = 0;                                             \
+       struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev);        \
+       struct iscsi_transport *t = session->transport;                 \
+                                                                       \
+       t->get_session_param(session, param, &value);                   \
+       return snprintf(buf, 20, format"\n", value);                    \
+}
+
+#define iscsi_session_int_attr(field, param, format)                   \
+       iscsi_session_int_attr_show(param, format)                      \
+static ISCSI_CLASS_ATTR(sess, field, S_IRUGO, show_session_int_param_##param, \
+                       NULL);
+
+iscsi_session_int_attr(initial_r2t, ISCSI_PARAM_INITIAL_R2T_EN, "%d");
+iscsi_session_int_attr(max_outstanding_r2t, ISCSI_PARAM_MAX_R2T, "%hu");
+iscsi_session_int_attr(immediate_data, ISCSI_PARAM_IMM_DATA_EN, "%d");
+iscsi_session_int_attr(first_burst_len, ISCSI_PARAM_FIRST_BURST, "%u");
+iscsi_session_int_attr(max_burst_len, ISCSI_PARAM_MAX_BURST, "%u");
+iscsi_session_int_attr(data_pdu_in_order, ISCSI_PARAM_PDU_INORDER_EN, "%d");
+iscsi_session_int_attr(data_seq_in_order, ISCSI_PARAM_DATASEQ_INORDER_EN, "%d");
+iscsi_session_int_attr(erl, ISCSI_PARAM_ERL, "%d");
+iscsi_session_int_attr(tpgt, ISCSI_PARAM_TPGT, "%d");
+
+#define iscsi_session_str_attr_show(param)                             \
+static ssize_t                                                         \
+show_session_str_param_##param(struct class_device *cdev, char *buf)   \
+{                                                                      \
+       struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \
+       struct iscsi_transport *t = session->transport;                 \
+       return t->get_session_str_param(session, param, buf);           \
+}
+
+#define iscsi_session_str_attr(field, param)                           \
+       iscsi_session_str_attr_show(param)                              \
+static ISCSI_CLASS_ATTR(sess, field, S_IRUGO, show_session_str_param_##param, \
+                       NULL);
+
+iscsi_session_str_attr(targetname, ISCSI_PARAM_TARGET_NAME);
 
 /*
- * Again, this is used for iSCSI names. Normally, we follow
- * the transport class convention of having the lld set
- * the field, but in these cases the value is too large.
+ * Private session and conn attrs. userspace uses several iscsi values
+ * to identify each session between reboots. Some of these values may not
+ * be present in the iscsi_transport/LLD driver becuase userspace handles
+ * login (and failback for login redirect) so for these type of drivers
+ * the class manages the attrs and values for the iscsi_transport/LLD
  */
-#define iscsi_host_show_str_fn(field)                                  \
-                                                                       \
+#define iscsi_priv_session_attr_show(field, format)                    \
 static ssize_t                                                         \
-show_host_str_##field(struct class_device *cdev, char *buf)            \
+show_priv_session_##field(struct class_device *cdev, char *buf)        \
 {                                                                      \
-       int ret = 0;                                                    \
-       struct Scsi_Host *shost = transport_class_to_shost(cdev);       \
-       struct iscsi_internal *i = to_iscsi_internal(shost->transportt); \
-                                                                       \
-       if (i->fnt->get_##field)                                        \
-               ret = i->fnt->get_##field(shost, buf, PAGE_SIZE);       \
-       return ret;                                                     \
+       struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \
+       return sprintf(buf, format"\n", session->field);                \
 }
 
-#define iscsi_host_rd_str_attr(field)                                  \
-       iscsi_host_show_str_fn(field)                                   \
-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_host_str_##field, NULL);
+#define iscsi_priv_session_attr(field, format)                         \
+       iscsi_priv_session_attr_show(field, format)                     \
+static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO, show_priv_session_##field, \
+                       NULL)
+iscsi_priv_session_attr(targetname, "%s");
+iscsi_priv_session_attr(tpgt, "%d");
+iscsi_priv_session_attr(recovery_tmo, "%d");
 
-iscsi_host_rd_str_attr(initiator_name);
-iscsi_host_rd_str_attr(initiator_alias);
+#define iscsi_priv_conn_attr_show(field, format)                       \
+static ssize_t                                                         \
+show_priv_conn_##field(struct class_device *cdev, char *buf)           \
+{                                                                      \
+       struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev);         \
+       return sprintf(buf, format"\n", conn->field);                   \
+}
 
-#define SETUP_SESSION_RD_ATTR(field)                                   \
-       if (i->fnt->show_##field) {                                     \
-               i->session_attrs[count] = &class_device_attr_##field;   \
+#define iscsi_priv_conn_attr(field, format)                            \
+       iscsi_priv_conn_attr_show(field, format)                        \
+static ISCSI_CLASS_ATTR(priv_conn, field, S_IRUGO, show_priv_conn_##field, \
+                       NULL)
+iscsi_priv_conn_attr(persistent_address, "%s");
+iscsi_priv_conn_attr(persistent_port, "%d");
+
+#define SETUP_PRIV_SESSION_RD_ATTR(field)                              \
+do {                                                                   \
+       priv->session_attrs[count] = &class_device_attr_priv_sess_##field; \
+       count++;                                                        \
+} while (0)
+
+#define SETUP_SESSION_RD_ATTR(field, param_flag)                       \
+do {                                                                   \
+       if (tt->param_mask & param_flag) {                              \
+               priv->session_attrs[count] = &class_device_attr_sess_##field; \
                count++;                                                \
-       }
+       }                                                               \
+} while (0)
 
-#define SETUP_HOST_RD_ATTR(field)                                      \
-       if (i->fnt->show_##field) {                                     \
-               i->host_attrs[count] = &class_device_attr_##field;      \
+#define SETUP_PRIV_CONN_RD_ATTR(field)                                 \
+do {                                                                   \
+       priv->conn_attrs[count] = &class_device_attr_priv_conn_##field; \
+       count++;                                                        \
+} while (0)
+
+#define SETUP_CONN_RD_ATTR(field, param_flag)                          \
+do {                                                                   \
+       if (tt->param_mask & param_flag) {                              \
+               priv->conn_attrs[count] = &class_device_attr_conn_##field; \
                count++;                                                \
-       }
+       }                                                               \
+} while (0)
 
-static int iscsi_host_match(struct attribute_container *cont,
-                         struct device *dev)
+static int iscsi_session_match(struct attribute_container *cont,
+                          struct device *dev)
 {
+       struct iscsi_cls_session *session;
        struct Scsi_Host *shost;
-       struct iscsi_internal *i;
+       struct iscsi_internal *priv;
 
-       if (!scsi_is_host_device(dev))
+       if (!iscsi_is_session_dev(dev))
                return 0;
 
-       shost = dev_to_shost(dev);
-       if (!shost->transportt  || shost->transportt->host_attrs.ac.class
-           != &iscsi_host_class.class)
+       session = iscsi_dev_to_session(dev);
+       shost = iscsi_session_to_shost(session);
+       if (!shost->transportt)
+               return 0;
+
+       priv = to_iscsi_internal(shost->transportt);
+       if (priv->session_cont.ac.class != &iscsi_session_class.class)
+               return 0;
+
+       return &priv->session_cont.ac == cont;
+}
+
+static int iscsi_conn_match(struct attribute_container *cont,
+                          struct device *dev)
+{
+       struct iscsi_cls_session *session;
+       struct iscsi_cls_conn *conn;
+       struct Scsi_Host *shost;
+       struct iscsi_internal *priv;
+
+       if (!iscsi_is_conn_dev(dev))
+               return 0;
+
+       conn = iscsi_dev_to_conn(dev);
+       session = iscsi_dev_to_session(conn->dev.parent);
+       shost = iscsi_session_to_shost(session);
+
+       if (!shost->transportt)
+               return 0;
+
+       priv = to_iscsi_internal(shost->transportt);
+       if (priv->conn_cont.ac.class != &iscsi_connection_class.class)
                return 0;
 
-       i = to_iscsi_internal(shost->transportt);
-       
-       return &i->t.host_attrs.ac == cont;
+       return &priv->conn_cont.ac == cont;
 }
 
-static int iscsi_target_match(struct attribute_container *cont,
+static int iscsi_host_match(struct attribute_container *cont,
                            struct device *dev)
 {
        struct Scsi_Host *shost;
-       struct iscsi_internal *i;
+       struct iscsi_internal *priv;
 
-       if (!scsi_is_target_device(dev))
+       if (!scsi_is_host_device(dev))
                return 0;
 
-       shost = dev_to_shost(dev->parent);
-       if (!shost->transportt  || shost->transportt->host_attrs.ac.class
-           != &iscsi_host_class.class)
+       shost = dev_to_shost(dev);
+       if (!shost->transportt  ||
+           shost->transportt->host_attrs.ac.class != &iscsi_host_class.class)
                return 0;
 
-       i = to_iscsi_internal(shost->transportt);
-       
-       return &i->t.target_attrs.ac == cont;
+        priv = to_iscsi_internal(shost->transportt);
+        return &priv->t.host_attrs.ac == cont;
 }
 
 struct scsi_transport_template *
-iscsi_attach_transport(struct iscsi_function_template *fnt)
+iscsi_register_transport(struct iscsi_transport *tt)
 {
-       struct iscsi_internal *i = kmalloc(sizeof(struct iscsi_internal),
-                                          GFP_KERNEL);
-       int count = 0;
+       struct iscsi_internal *priv;
+       unsigned long flags;
+       int count = 0, err;
+
+       BUG_ON(!tt);
+
+       priv = iscsi_if_transport_lookup(tt);
+       if (priv)
+               return NULL;
 
-       if (unlikely(!i))
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       if (!priv)
                return NULL;
+       INIT_LIST_HEAD(&priv->list);
+       priv->iscsi_transport = tt;
+       priv->t.user_scan = iscsi_user_scan;
 
-       memset(i, 0, sizeof(struct iscsi_internal));
-       i->fnt = fnt;
-
-       i->t.target_attrs.ac.attrs = &i->session_attrs[0];
-       i->t.target_attrs.ac.class = &iscsi_transport_class.class;
-       i->t.target_attrs.ac.match = iscsi_target_match;
-       transport_container_register(&i->t.target_attrs);
-       i->t.target_size = sizeof(struct iscsi_class_session);
-
-       SETUP_SESSION_RD_ATTR(tsih);
-       SETUP_SESSION_RD_ATTR(isid);
-       SETUP_SESSION_RD_ATTR(header_digest);
-       SETUP_SESSION_RD_ATTR(data_digest);
-       SETUP_SESSION_RD_ATTR(target_name);
-       SETUP_SESSION_RD_ATTR(target_alias);
-       SETUP_SESSION_RD_ATTR(port);
-       SETUP_SESSION_RD_ATTR(tpgt);
-       SETUP_SESSION_RD_ATTR(ip_address);
-       SETUP_SESSION_RD_ATTR(initial_r2t);
-       SETUP_SESSION_RD_ATTR(immediate_data);
-       SETUP_SESSION_RD_ATTR(max_recv_data_segment_len);
-       SETUP_SESSION_RD_ATTR(max_burst_len);
-       SETUP_SESSION_RD_ATTR(first_burst_len);
-       SETUP_SESSION_RD_ATTR(def_time2wait);
-       SETUP_SESSION_RD_ATTR(def_time2retain);
-       SETUP_SESSION_RD_ATTR(max_outstanding_r2t);
-       SETUP_SESSION_RD_ATTR(data_pdu_in_order);
-       SETUP_SESSION_RD_ATTR(data_sequence_in_order);
-       SETUP_SESSION_RD_ATTR(erl);
+       priv->cdev.class = &iscsi_transport_class;
+       snprintf(priv->cdev.class_id, BUS_ID_SIZE, "%s", tt->name);
+       err = class_device_register(&priv->cdev);
+       if (err)
+               goto free_priv;
 
-       BUG_ON(count > ISCSI_SESSION_ATTRS);
-       i->session_attrs[count] = NULL;
+       err = sysfs_create_group(&priv->cdev.kobj, &iscsi_transport_group);
+       if (err)
+               goto unregister_cdev;
+
+       /* host parameters */
+       priv->t.host_attrs.ac.attrs = &priv->host_attrs[0];
+       priv->t.host_attrs.ac.class = &iscsi_host_class.class;
+       priv->t.host_attrs.ac.match = iscsi_host_match;
+       priv->t.host_size = sizeof(struct iscsi_host);
+       priv->host_attrs[0] = NULL;
+       transport_container_register(&priv->t.host_attrs);
+
+       /* connection parameters */
+       priv->conn_cont.ac.attrs = &priv->conn_attrs[0];
+       priv->conn_cont.ac.class = &iscsi_connection_class.class;
+       priv->conn_cont.ac.match = iscsi_conn_match;
+       transport_container_register(&priv->conn_cont);
 
-       i->t.host_attrs.ac.attrs = &i->host_attrs[0];
-       i->t.host_attrs.ac.class = &iscsi_host_class.class;
-       i->t.host_attrs.ac.match = iscsi_host_match;
-       transport_container_register(&i->t.host_attrs);
-       i->t.host_size = 0;
+       SETUP_CONN_RD_ATTR(max_recv_dlength, ISCSI_MAX_RECV_DLENGTH);
+       SETUP_CONN_RD_ATTR(max_xmit_dlength, ISCSI_MAX_XMIT_DLENGTH);
+       SETUP_CONN_RD_ATTR(header_digest, ISCSI_HDRDGST_EN);
+       SETUP_CONN_RD_ATTR(data_digest, ISCSI_DATADGST_EN);
+       SETUP_CONN_RD_ATTR(ifmarker, ISCSI_IFMARKER_EN);
+       SETUP_CONN_RD_ATTR(ofmarker, ISCSI_OFMARKER_EN);
+       SETUP_CONN_RD_ATTR(address, ISCSI_CONN_ADDRESS);
+       SETUP_CONN_RD_ATTR(port, ISCSI_CONN_PORT);
+       SETUP_CONN_RD_ATTR(exp_statsn, ISCSI_EXP_STATSN);
 
+       if (tt->param_mask & ISCSI_PERSISTENT_ADDRESS)
+               SETUP_CONN_RD_ATTR(persistent_address, ISCSI_PERSISTENT_ADDRESS);
+       else
+               SETUP_PRIV_CONN_RD_ATTR(persistent_address);
+
+       if (tt->param_mask & ISCSI_PERSISTENT_PORT)
+               SETUP_CONN_RD_ATTR(persistent_port, ISCSI_PERSISTENT_PORT);
+       else
+               SETUP_PRIV_CONN_RD_ATTR(persistent_port);
+
+       BUG_ON(count > ISCSI_CONN_ATTRS);
+       priv->conn_attrs[count] = NULL;
        count = 0;
-       SETUP_HOST_RD_ATTR(initiator_name);
-       SETUP_HOST_RD_ATTR(initiator_alias);
 
-       BUG_ON(count > ISCSI_HOST_ATTRS);
-       i->host_attrs[count] = NULL;
+       /* session parameters */
+       priv->session_cont.ac.attrs = &priv->session_attrs[0];
+       priv->session_cont.ac.class = &iscsi_session_class.class;
+       priv->session_cont.ac.match = iscsi_session_match;
+       transport_container_register(&priv->session_cont);
+
+       SETUP_SESSION_RD_ATTR(initial_r2t, ISCSI_INITIAL_R2T_EN);
+       SETUP_SESSION_RD_ATTR(max_outstanding_r2t, ISCSI_MAX_R2T);
+       SETUP_SESSION_RD_ATTR(immediate_data, ISCSI_IMM_DATA_EN);
+       SETUP_SESSION_RD_ATTR(first_burst_len, ISCSI_FIRST_BURST);
+       SETUP_SESSION_RD_ATTR(max_burst_len, ISCSI_MAX_BURST);
+       SETUP_SESSION_RD_ATTR(data_pdu_in_order, ISCSI_PDU_INORDER_EN);
+       SETUP_SESSION_RD_ATTR(data_seq_in_order, ISCSI_DATASEQ_INORDER_EN);
+       SETUP_SESSION_RD_ATTR(erl, ISCSI_ERL);
+       SETUP_PRIV_SESSION_RD_ATTR(recovery_tmo);
+
+       if (tt->param_mask & ISCSI_TARGET_NAME)
+               SETUP_SESSION_RD_ATTR(targetname, ISCSI_TARGET_NAME);
+       else
+               SETUP_PRIV_SESSION_RD_ATTR(targetname);
+
+       if (tt->param_mask & ISCSI_TPGT)
+               SETUP_SESSION_RD_ATTR(tpgt, ISCSI_TPGT);
+       else
+               SETUP_PRIV_SESSION_RD_ATTR(tpgt);
+
+       BUG_ON(count > ISCSI_SESSION_ATTRS);
+       priv->session_attrs[count] = NULL;
+
+       spin_lock_irqsave(&iscsi_transport_lock, flags);
+       list_add(&priv->list, &iscsi_transports);
+       spin_unlock_irqrestore(&iscsi_transport_lock, flags);
+
+       printk(KERN_NOTICE "iscsi: registered transport (%s)\n", tt->name);
+       return &priv->t;
 
-       return &i->t;
+unregister_cdev:
+       class_device_unregister(&priv->cdev);
+free_priv:
+       kfree(priv);
+       return NULL;
 }
+EXPORT_SYMBOL_GPL(iscsi_register_transport);
+
+int iscsi_unregister_transport(struct iscsi_transport *tt)
+{
+       struct iscsi_internal *priv;
+       unsigned long flags;
+
+       BUG_ON(!tt);
 
-EXPORT_SYMBOL(iscsi_attach_transport);
+       mutex_lock(&rx_queue_mutex);
 
-void iscsi_release_transport(struct scsi_transport_template *t)
+       priv = iscsi_if_transport_lookup(tt);
+       BUG_ON (!priv);
+
+       spin_lock_irqsave(&iscsi_transport_lock, flags);
+       list_del(&priv->list);
+       spin_unlock_irqrestore(&iscsi_transport_lock, flags);
+
+       transport_container_unregister(&priv->conn_cont);
+       transport_container_unregister(&priv->session_cont);
+       transport_container_unregister(&priv->t.host_attrs);
+
+       sysfs_remove_group(&priv->cdev.kobj, &iscsi_transport_group);
+       class_device_unregister(&priv->cdev);
+       mutex_unlock(&rx_queue_mutex);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(iscsi_unregister_transport);
+
+static int
+iscsi_rcv_nl_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
-       struct iscsi_internal *i = to_iscsi_internal(t);
+       struct netlink_notify *n = ptr;
 
-       transport_container_unregister(&i->t.target_attrs);
-       transport_container_unregister(&i->t.host_attrs);
-  
-       kfree(i);
+       if (event == NETLINK_URELEASE &&
+           n->protocol == NETLINK_ISCSI && n->pid) {
+               struct iscsi_cls_conn *conn;
+               unsigned long flags;
+
+               mempool_zone_complete(z_reply);
+               spin_lock_irqsave(&connlock, flags);
+               list_for_each_entry(conn, &connlist, conn_list) {
+                       mempool_zone_complete(conn->z_error);
+                       mempool_zone_complete(conn->z_pdu);
+               }
+               spin_unlock_irqrestore(&connlock, flags);
+       }
+
+       return NOTIFY_DONE;
 }
 
-EXPORT_SYMBOL(iscsi_release_transport);
+static struct notifier_block iscsi_nl_notifier = {
+       .notifier_call  = iscsi_rcv_nl_event,
+};
 
 static __init int iscsi_transport_init(void)
 {
-       int err = transport_class_register(&iscsi_transport_class);
+       int err;
 
+       err = class_register(&iscsi_transport_class);
        if (err)
                return err;
-       return transport_class_register(&iscsi_host_class);
+
+       err = transport_class_register(&iscsi_host_class);
+       if (err)
+               goto unregister_transport_class;
+
+       err = transport_class_register(&iscsi_connection_class);
+       if (err)
+               goto unregister_host_class;
+
+       err = transport_class_register(&iscsi_session_class);
+       if (err)
+               goto unregister_conn_class;
+
+       err = netlink_register_notifier(&iscsi_nl_notifier);
+       if (err)
+               goto unregister_session_class;
+
+       nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx,
+                       THIS_MODULE);
+       if (!nls) {
+               err = -ENOBUFS;
+               goto unregister_notifier;
+       }
+
+       z_reply = mempool_zone_init(Z_MAX_REPLY,
+               NLMSG_SPACE(sizeof(struct iscsi_uevent)), Z_HIWAT_REPLY);
+       if (z_reply)
+               return 0;
+
+       sock_release(nls->sk_socket);
+unregister_notifier:
+       netlink_unregister_notifier(&iscsi_nl_notifier);
+unregister_session_class:
+       transport_class_unregister(&iscsi_session_class);
+unregister_conn_class:
+       transport_class_unregister(&iscsi_connection_class);
+unregister_host_class:
+       transport_class_unregister(&iscsi_host_class);
+unregister_transport_class:
+       class_unregister(&iscsi_transport_class);
+       return err;
 }
 
 static void __exit iscsi_transport_exit(void)
 {
+       mempool_zone_destroy(z_reply);
+       sock_release(nls->sk_socket);
+       netlink_unregister_notifier(&iscsi_nl_notifier);
+       transport_class_unregister(&iscsi_connection_class);
+       transport_class_unregister(&iscsi_session_class);
        transport_class_unregister(&iscsi_host_class);
-       transport_class_unregister(&iscsi_transport_class);
+       class_unregister(&iscsi_transport_class);
 }
 
 module_init(iscsi_transport_init);
 module_exit(iscsi_transport_exit);
 
-MODULE_AUTHOR("Mike Christie");
-MODULE_DESCRIPTION("iSCSI Transport Attributes");
+MODULE_AUTHOR("Mike Christie <michaelc@cs.wisc.edu>, "
+             "Dmitry Yusupov <dmitry_yus@yahoo.com>, "
+             "Alex Aizman <itn780@yahoo.com>");
+MODULE_DESCRIPTION("iSCSI Transport Interface");
 MODULE_LICENSE("GPL");