Merge tag 'sound-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / iscsi_tcp.c

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index a669f2d11c314e380eb2aa90714b91eb0064f781..427af0f24b0f2bdde43e39cdf3334518f89d2b8e 100644 (file)
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -726,13 +726,18 @@ static int iscsi_sw_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn,
        switch(param) {
        case ISCSI_PARAM_CONN_PORT:
        case ISCSI_PARAM_CONN_ADDRESS:
+       case ISCSI_PARAM_LOCAL_PORT:
                spin_lock_bh(&conn->session->frwd_lock);
                if (!tcp_sw_conn || !tcp_sw_conn->sock) {
                        spin_unlock_bh(&conn->session->frwd_lock);
                        return -ENOTCONN;
                }
-               rc = kernel_getpeername(tcp_sw_conn->sock,
-                                       (struct sockaddr *)&addr, &len);
+               if (param == ISCSI_PARAM_LOCAL_PORT)
+                       rc = kernel_getsockname(tcp_sw_conn->sock,
+                                               (struct sockaddr *)&addr, &len);
+               else
+                       rc = kernel_getpeername(tcp_sw_conn->sock,
+                                               (struct sockaddr *)&addr, &len);
                spin_unlock_bh(&conn->session->frwd_lock);
                if (rc)
                        return rc;
@@ -895,6 +900,7 @@ static umode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)
                case ISCSI_PARAM_DATADGST_EN:
                case ISCSI_PARAM_CONN_ADDRESS:
                case ISCSI_PARAM_CONN_PORT:
+               case ISCSI_PARAM_LOCAL_PORT:
                case ISCSI_PARAM_EXP_STATSN:
                case ISCSI_PARAM_PERSISTENT_ADDRESS:
                case ISCSI_PARAM_PERSISTENT_PORT: