diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:44:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:44:18 -0400 |
| commit | ec7ae517537ae5c7b0b2cd7f562dfa3e7a05b954 (patch) | |
| tree | e6b0c64a51a7c0aa0efd09d4f7a80872e3b1657a /drivers/scsi/cxgbi/cxgb3i | |
| parent | 97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d (diff) | |
| parent | 590134fa78fbdbe5fea78c7ae0b2c3364bc9572f (diff) | |
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
...
Diffstat (limited to 'drivers/scsi/cxgbi/cxgb3i')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c index 1242c7c04a01..000294a9df80 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | |||
| @@ -105,25 +105,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = { | |||
| 105 | .caps = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST | 105 | .caps = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST |
| 106 | | CAP_DATADGST | CAP_DIGEST_OFFLOAD | | 106 | | CAP_DATADGST | CAP_DIGEST_OFFLOAD | |
| 107 | CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO, | 107 | CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO, |
| 108 | .param_mask = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH | | 108 | .attr_is_visible = cxgbi_attr_is_visible, |
| 109 | ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN | | ||
| 110 | ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T | | ||
| 111 | ISCSI_IMM_DATA_EN | ISCSI_FIRST_BURST | | ||
| 112 | ISCSI_MAX_BURST | ISCSI_PDU_INORDER_EN | | ||
| 113 | ISCSI_DATASEQ_INORDER_EN | ISCSI_ERL | | ||
| 114 | ISCSI_CONN_PORT | ISCSI_CONN_ADDRESS | | ||
| 115 | ISCSI_EXP_STATSN | ISCSI_PERSISTENT_PORT | | ||
| 116 | ISCSI_PERSISTENT_ADDRESS | | ||
| 117 | ISCSI_TARGET_NAME | ISCSI_TPGT | | ||
| 118 | ISCSI_USERNAME | ISCSI_PASSWORD | | ||
| 119 | ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN | | ||
| 120 | ISCSI_FAST_ABORT | ISCSI_ABORT_TMO | | ||
| 121 | ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO | | ||
| 122 | ISCSI_PING_TMO | ISCSI_RECV_TMO | | ||
| 123 | ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME, | ||
| 124 | .host_param_mask = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS | | ||
| 125 | ISCSI_HOST_INITIATOR_NAME | | ||
| 126 | ISCSI_HOST_NETDEV_NAME, | ||
| 127 | .get_host_param = cxgbi_get_host_param, | 109 | .get_host_param = cxgbi_get_host_param, |
| 128 | .set_host_param = cxgbi_set_host_param, | 110 | .set_host_param = cxgbi_set_host_param, |
| 129 | /* session management */ | 111 | /* session management */ |