7 files changed, 25 insertions, 5 deletions

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index bed583c426e6..1bf173decade 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -583,6 +583,7 @@ static struct iscsi_transport iscsi_iser_transport = {
                                   ISCSI_USERNAME | ISCSI_PASSWORD |
                                   ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN,
         .host_param_mask        = ISCSI_HOST_HWADDRESS |
+                                  ISCSI_HOST_NETDEV_NAME |
                                   ISCSI_HOST_INITIATOR_NAME,
         .host_template          = &iscsi_iser_sht,
         .conndata_size          = sizeof(struct iscsi_conn),
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index da66fb524b5b..d5a6527b3b3d 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -2303,7 +2303,8 @@ static struct iscsi_transport iscsi_tcp_transport = {
                                   ISCSI_USERNAME | ISCSI_PASSWORD |
                                   ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN,
         .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
-                                  ISCSI_HOST_INITIATOR_NAME,
+                                  ISCSI_HOST_INITIATOR_NAME |
+                                  ISCSI_HOST_NETDEV_NAME,
         .host_template          = &iscsi_sht,
         .conndata_size          = sizeof(struct iscsi_conn),
         .max_conn               = 1,
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 1632866f52cc..865dd5739f0e 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1483,6 +1483,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)
         kfree(session->username);
         kfree(session->username_in);
         kfree(session->targetname);
+        kfree(session->netdev);
         kfree(session->hwaddress);
         kfree(session->initiatorname);
 
@@ -2040,6 +2041,12 @@ int iscsi_host_get_param(struct Scsi_Host *shost, enum iscsi_host_param param,
         int len;
 
         switch (param) {
+        case ISCSI_HOST_PARAM_NETDEV_NAME:
+                if (!session->netdev)
+                        len = sprintf(buf, "%s\n", "default");
+                else
+                        len = sprintf(buf, "%s\n", session->netdev);
+                break;
         case ISCSI_HOST_PARAM_HWADDRESS:
                 if (!session->hwaddress)
                         len = sprintf(buf, "%s\n", "default");
@@ -2067,6 +2074,10 @@ int iscsi_host_set_param(struct Scsi_Host *shost, enum iscsi_host_param param,
         struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
 
         switch (param) {
+        case ISCSI_HOST_PARAM_NETDEV_NAME:
+                if (!session->netdev)
+                        session->netdev = kstrdup(buf, GFP_KERNEL);
+                break;
         case ISCSI_HOST_PARAM_HWADDRESS:
                 if (!session->hwaddress)
                         session->hwaddress = kstrdup(buf, GFP_KERNEL);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index b87b460832ea..e69160a7bc60 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -102,7 +102,8 @@ static struct scsi_host_template qla4xxx_driver_template = {
 static struct iscsi_transport qla4xxx_iscsi_transport = {
         .owner                  = THIS_MODULE,
         .name                   = DRIVER_NAME,
-        .caps                   = CAP_FW_DB | CAP_SENDTARGETS_OFFLOAD,
+        .caps                   = CAP_FW_DB | CAP_SENDTARGETS_OFFLOAD |
+                                  CAP_DATA_PATH_OFFLOAD,
         .param_mask             = ISCSI_CONN_PORT | ISCSI_CONN_ADDRESS |
                                   ISCSI_TARGET_NAME | ISCSI_TPGT,
         .host_param_mask        = ISCSI_HOST_HWADDRESS |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 9b54eea20560..34c1860a259d 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -32,7 +32,7 @@
 
 #define ISCSI_SESSION_ATTRS 15
 #define ISCSI_CONN_ATTRS 11
-#define ISCSI_HOST_ATTRS 3
+#define ISCSI_HOST_ATTRS 4
 #define ISCSI_TRANSPORT_VERSION "2.0-724"
 
 struct iscsi_internal {
@@ -1261,8 +1261,9 @@ show_host_param_##param(struct class_device *cdev, char *buf)		\
 static ISCSI_CLASS_ATTR(host, field, S_IRUGO, show_host_param_##param,  \
                         NULL);
 
-iscsi_host_attr(ipaddress, ISCSI_HOST_PARAM_IPADDRESS);
+iscsi_host_attr(netdev, ISCSI_HOST_PARAM_NETDEV_NAME);
 iscsi_host_attr(hwaddress, ISCSI_HOST_PARAM_HWADDRESS);
+iscsi_host_attr(ipaddress, ISCSI_HOST_PARAM_IPADDRESS);
 iscsi_host_attr(initiatorname, ISCSI_HOST_PARAM_INITIATOR_NAME);
 
 #define SETUP_PRIV_SESSION_RD_ATTR(field)                               \
@@ -1399,6 +1400,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
         priv->t.host_size = sizeof(struct iscsi_host);
         transport_container_register(&priv->t.host_attrs);
 
+        SETUP_HOST_RD_ATTR(netdev, ISCSI_HOST_NETDEV_NAME);
         SETUP_HOST_RD_ATTR(ipaddress, ISCSI_HOST_IPADDRESS);
         SETUP_HOST_RD_ATTR(hwaddress, ISCSI_HOST_HWADDRESS);
         SETUP_HOST_RD_ATTR(initiatorname, ISCSI_HOST_INITIATOR_NAME);
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 642998069e00..50e907f42048 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -271,12 +271,14 @@ enum iscsi_param {
 enum iscsi_host_param {
         ISCSI_HOST_PARAM_HWADDRESS,
         ISCSI_HOST_PARAM_INITIATOR_NAME,
+        ISCSI_HOST_PARAM_NETDEV_NAME,
         ISCSI_HOST_PARAM_IPADDRESS,
         ISCSI_HOST_PARAM_MAX,
 };
 
 #define ISCSI_HOST_HWADDRESS            (1 << ISCSI_HOST_PARAM_HWADDRESS)
 #define ISCSI_HOST_INITIATOR_NAME       (1 << ISCSI_HOST_PARAM_INITIATOR_NAME)
+#define ISCSI_HOST_NETDEV_NAME          (1 << ISCSI_HOST_PARAM_NETDEV_NAME)
 #define ISCSI_HOST_IPADDRESS            (1 << ISCSI_HOST_PARAM_IPADDRESS)
 
 #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
@@ -303,6 +305,7 @@ enum iscsi_host_param {
 #define CAP_MARKERS             0x100
 #define CAP_FW_DB               0x200
 #define CAP_SENDTARGETS_OFFLOAD 0x400
+#define CAP_DATA_PATH_OFFLOAD   0x800
 
 /*
  * These flags describes reason of stop_conn() call
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index eea33f7b1544..3f631b08a1ab 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -228,8 +228,9 @@ struct iscsi_session {
         char                    *password_in;
         char                    *targetname;
         char                    *initiatorname;
-        /* hw address being used for iscsi connection */
+        /* hw address or netdev iscsi connection is bound to */
         char                    *hwaddress;
+        char                    *netdev;
         /* control data */
         struct iscsi_transport  *tt;
         struct Scsi_Host        *host;