Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
  [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
  [SCSI] ipr: Fix BUG on adapter dump timeout
  [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
  [SCSI] hpsa: change confusing message to be more clear
  [SCSI] iscsi class: fix vlan configuration
  [SCSI] qla4xxx: fix data alignment and use nl helpers
  [SCSI] iscsi class: fix link local mispelling
  [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
  [SCSI] aacraid: use lower snprintf() limit
  [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
  [SCSI] lpfc 8.3.27: T10 additions for SLI4
  [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
  [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
  [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
  [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
  [SCSI] megaraid_sas: Changelog and version update
  [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
  [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
  [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
  [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
  ...

1 files changed, 54 insertions, 26 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index cffd4d75df56..d1e697190970 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -2177,6 +2177,59 @@ static int bnx2i_nl_set_path(struct Scsi_Host *shost, struct iscsi_path *params)
         return 0;
 }
 
+static mode_t bnx2i_attr_is_visible(int param_type, int param)
+{
+        switch (param_type) {
+        case ISCSI_HOST_PARAM:
+                switch (param) {
+                case ISCSI_HOST_PARAM_NETDEV_NAME:
+                case ISCSI_HOST_PARAM_HWADDRESS:
+                case ISCSI_HOST_PARAM_IPADDRESS:
+                        return S_IRUGO;
+                default:
+                        return 0;
+                }
+        case ISCSI_PARAM:
+                switch (param) {
+                case ISCSI_PARAM_MAX_RECV_DLENGTH:
+                case ISCSI_PARAM_MAX_XMIT_DLENGTH:
+                case ISCSI_PARAM_HDRDGST_EN:
+                case ISCSI_PARAM_DATADGST_EN:
+                case ISCSI_PARAM_CONN_ADDRESS:
+                case ISCSI_PARAM_CONN_PORT:
+                case ISCSI_PARAM_EXP_STATSN:
+                case ISCSI_PARAM_PERSISTENT_ADDRESS:
+                case ISCSI_PARAM_PERSISTENT_PORT:
+                case ISCSI_PARAM_PING_TMO:
+                case ISCSI_PARAM_RECV_TMO:
+                case ISCSI_PARAM_INITIAL_R2T_EN:
+                case ISCSI_PARAM_MAX_R2T:
+                case ISCSI_PARAM_IMM_DATA_EN:
+                case ISCSI_PARAM_FIRST_BURST:
+                case ISCSI_PARAM_MAX_BURST:
+                case ISCSI_PARAM_PDU_INORDER_EN:
+                case ISCSI_PARAM_DATASEQ_INORDER_EN:
+                case ISCSI_PARAM_ERL:
+                case ISCSI_PARAM_TARGET_NAME:
+                case ISCSI_PARAM_TPGT:
+                case ISCSI_PARAM_USERNAME:
+                case ISCSI_PARAM_PASSWORD:
+                case ISCSI_PARAM_USERNAME_IN:
+                case ISCSI_PARAM_PASSWORD_IN:
+                case ISCSI_PARAM_FAST_ABORT:
+                case ISCSI_PARAM_ABORT_TMO:
+                case ISCSI_PARAM_LU_RESET_TMO:
+                case ISCSI_PARAM_TGT_RESET_TMO:
+                case ISCSI_PARAM_IFACE_NAME:
+                case ISCSI_PARAM_INITIATOR_NAME:
+                        return S_IRUGO;
+                default:
+                        return 0;
+                }
+        }
+
+        return 0;
+}
 
 /*
  * 'Scsi_Host_Template' structure and 'iscsi_tranport' structure template
@@ -2207,37 +2260,12 @@ struct iscsi_transport bnx2i_iscsi_transport = {
                                   CAP_MULTI_R2T | CAP_DATADGST |
                                   CAP_DATA_PATH_OFFLOAD |
                                   CAP_TEXT_NEGO,
-        .param_mask             = ISCSI_MAX_RECV_DLENGTH |
-                                  ISCSI_MAX_XMIT_DLENGTH |
-                                  ISCSI_HDRDGST_EN |
-                                  ISCSI_DATADGST_EN |
-                                  ISCSI_INITIAL_R2T_EN |
-                                  ISCSI_MAX_R2T |
-                                  ISCSI_IMM_DATA_EN |
-                                  ISCSI_FIRST_BURST |
-                                  ISCSI_MAX_BURST |
-                                  ISCSI_PDU_INORDER_EN |
-                                  ISCSI_DATASEQ_INORDER_EN |
-                                  ISCSI_ERL |
-                                  ISCSI_CONN_PORT |
-                                  ISCSI_CONN_ADDRESS |
-                                  ISCSI_EXP_STATSN |
-                                  ISCSI_PERSISTENT_PORT |
-                                  ISCSI_PERSISTENT_ADDRESS |
-                                  ISCSI_TARGET_NAME | ISCSI_TPGT |
-                                  ISCSI_USERNAME | ISCSI_PASSWORD |
-                                  ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |
-                                  ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |
-                                  ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |
-                                  ISCSI_PING_TMO | ISCSI_RECV_TMO |
-                                  ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,
-        .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
-                                  ISCSI_HOST_NETDEV_NAME,
         .create_session         = bnx2i_session_create,
         .destroy_session        = bnx2i_session_destroy,
         .create_conn            = bnx2i_conn_create,
         .bind_conn              = bnx2i_conn_bind,
         .destroy_conn           = bnx2i_conn_destroy,
+        .attr_is_visible        = bnx2i_attr_is_visible,
         .set_param              = iscsi_set_param,
         .get_conn_param         = iscsi_conn_get_param,
         .get_session_param      = iscsi_session_get_param,