diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-01-08 19:20:35 -0800 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-01-08 19:20:35 -0800 |
commit | a47fff1056376fab0929661e8cc85f90572cf55a (patch) | |
tree | 13644967ef789fb5ebc85000d810255cc7c7f864 /drivers/scsi/bfa | |
parent | db27edf80c894e89b9710d20a8d0f02327f36ca0 (diff) | |
parent | 2d1148f0f45079d25a0fa0d67e4fdb2a656d12fb (diff) | |
download | linux-stable-a47fff1056376fab0929661e8cc85f90572cf55a.tar.gz linux-stable-a47fff1056376fab0929661e8cc85f90572cf55a.tar.bz2 linux-stable-a47fff1056376fab0929661e8cc85f90572cf55a.zip |
Merge remote-tracking branch 'mkp-scsi/fixes' into fixes
Diffstat (limited to 'drivers/scsi/bfa')
-rw-r--r-- | drivers/scsi/bfa/bfad.c | 6 | ||||
-rw-r--r-- | drivers/scsi/bfa/bfad_drv.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index d9e15210b110..5caf5f3ff642 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -64,9 +64,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS; u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size; u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; -#define BFAD_FW_FILE_CB "cbfw-3.2.3.0.bin" -#define BFAD_FW_FILE_CT "ctfw-3.2.3.0.bin" -#define BFAD_FW_FILE_CT2 "ct2fw-3.2.3.0.bin" +#define BFAD_FW_FILE_CB "cbfw-3.2.5.1.bin" +#define BFAD_FW_FILE_CT "ctfw-3.2.5.1.bin" +#define BFAD_FW_FILE_CT2 "ct2fw-3.2.5.1.bin" static u32 *bfad_load_fwimg(struct pci_dev *pdev); static void bfad_free_fwimg(void); diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index f9e862093a25..cfcfff48e8e1 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h @@ -58,7 +58,7 @@ #ifdef BFA_DRIVER_VERSION #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION #else -#define BFAD_DRIVER_VERSION "3.2.25.0" +#define BFAD_DRIVER_VERSION "3.2.25.1" #endif #define BFAD_PROTO_NAME FCPI_NAME |