Fnic: Not probing all the vNICS via fnic_probe on boot
authorHiral Shah <hishah@cisco.com>
Mon, 10 Nov 2014 20:54:32 +0000 (12:54 -0800)
committerChristoph Hellwig <hch@lst.de>
Thu, 20 Nov 2014 08:10:08 +0000 (09:10 +0100)
In fnic_dev_wait, Wait for finish to complete at least three times in two
seconds while loop before returning -ETIMEDOUT as sometime
schedule_timeout_uninterruptible takes more than two seconds to wake up.

- Increment fnic version from 1.6.0.11 to 1.6.0.12

Signed-off-by: Hiral Shah <hishah@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Anil Chintalapati <achintal@cisco.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/fnic/fnic.h
drivers/scsi/fnic/fnic_main.c

Simple merge
Simple merge