diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
| commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
| tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /drivers/fc4/fc.c | |
| parent | cbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
| download | blackbird-op-linux-6de7dc2c4c713d037c19aa1e310d240f16973414.tar.gz blackbird-op-linux-6de7dc2c4c713d037c19aa1e310d240f16973414.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/fc4/fc.c')
| -rw-r--r-- | drivers/fc4/fc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index e3c958823533..5d961f5e0ca0 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c @@ -365,6 +365,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister) kfree (fc->scsi_bitmap); kfree (fc->cmd_slots); FCND(("Unregistering\n")); +#if 0 if (fc->rst_pkt) { if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED) kfree(fc->rst_pkt); @@ -373,6 +374,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister) printk("FC: Reset in progress. Now?!"); } } +#endif FCND(("Unregistered\n")); } } else @@ -915,6 +917,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt) } } +#if 0 void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt) { fc_channel *fc = FC_SCMND(SCpnt); @@ -922,11 +925,13 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt) fc->rst_pkt->eh_state = SCSI_STATE_FINISHED; up(fc->rst_pkt->device->host->eh_action); } +#endif #define FCP_RESET_TIMEOUT (2*HZ) int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) { +#if 0 /* broken junk, but if davem wants to compile this driver, let him.. */ unsigned long flags; fcp_cmd *cmd; fcp_cmnd *fcmd; @@ -1000,6 +1005,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) } fc->rst_pkt->eh_state = SCSI_STATE_UNUSED; return SUCCESS; +#endif } static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt) |
