diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /drivers/scsi/bfa/bfad_im.c | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/scsi/bfa/bfad_im.c')
| -rw-r--r-- | drivers/scsi/bfa/bfad_im.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c index 158c99243c08..55d012a9a668 100644 --- a/drivers/scsi/bfa/bfad_im.c +++ b/drivers/scsi/bfa/bfad_im.c | |||
| @@ -948,7 +948,7 @@ bfad_os_fc_host_init(struct bfad_im_port_s *im_port) | |||
| 948 | if (bfad_supported_fc4s & (BFA_PORT_ROLE_FCP_IM | BFA_PORT_ROLE_FCP_TM)) | 948 | if (bfad_supported_fc4s & (BFA_PORT_ROLE_FCP_IM | BFA_PORT_ROLE_FCP_TM)) |
| 949 | /* For FCP type 0x08 */ | 949 | /* For FCP type 0x08 */ |
| 950 | fc_host_supported_fc4s(host)[2] = 1; | 950 | fc_host_supported_fc4s(host)[2] = 1; |
| 951 | if (bfad_supported_fc4s | BFA_PORT_ROLE_FCP_IPFC) | 951 | if (bfad_supported_fc4s & BFA_PORT_ROLE_FCP_IPFC) |
| 952 | /* For LLC/SNAP type 0x05 */ | 952 | /* For LLC/SNAP type 0x05 */ |
| 953 | fc_host_supported_fc4s(host)[3] = 0x20; | 953 | fc_host_supported_fc4s(host)[3] = 0x20; |
| 954 | /* For fibre channel services type 0x20 */ | 954 | /* For fibre channel services type 0x20 */ |