Re: linux-next: Tree for December 29 (fcoe/libfc)

Randy Dunlap
2008-12-30T17:36:16Z

James Bottomley wrote:
> On Tue, 2008-12-30 at 08:54 -0800, Randy Dunlap wrote:
>> James Bottomley wrote:
>>> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
>>> index 0e5e084..9f4cc8e 100644
>>> --- a/drivers/scsi/Kconfig
>>> +++ b/drivers/scsi/Kconfig
>>> @@ -607,13 +607,12 @@ config SCSI_FLASHPOINT
>>>
>>> config LIBFC
>>> tristate "LibFC module"
>>> - depends on SCSI && SCSI_FC_ATTRS
>>> + select SCSI_FC_ATTRS
>>> ---help---
>>> Fibre Channel library module
>>>
>>> config FCOE
>>> tristate "FCoE module"
>>> - depends on SCSI
>>> select LIBFC
>>> ---help---
>>> Fibre Channel over Ethernet module
>>>
>>>
>> This still has a build error when CONFIG_PCI=n:
>>
>>
>> linux-next-20081229/drivers/scsi/fcoe/fc_transport_fcoe.c: In function 'fcoe_load_transport_driver':
>> linux-next-20081229/drivers/scsi/fcoe/fc_transport_fcoe.c:324: error: 'pci_bus_type' undeclared (first use in this function)
>> make[4]: *** [drivers/scsi/fcoe/fc_transport_fcoe.o] Error 1
>
> OK, so take two would make FCOE depend on SCSI, like this.
>
> James
>
> ---
>
> From: James Bottomley <James.Bottomley@HansenPartnership.com>
> Subject: [SCSI] fcoe: fix configuration problems
>
> fcoe selects libfc and requires SCSI and PCI (the SCSI requirement is
> implicitly covered by an enclosing if). Fix them both up so they
> cannot be configured in an invalid state: make LIBFC select
> SCSI_FC_ATTRS and make FCOE depend on PCI and select LIBFC.
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
> ---
> drivers/scsi/Kconfig | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 0e5e084..152d4aa 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -607,13 +607,13 @@ config SCSI_FLASHPOINT
>
> config LIBFC
> tristate "LibFC module"
> - depends on SCSI && SCSI_FC_ATTRS
> + select SCSI_FC_ATTRS
> ---help---
> Fibre Channel library module
>
> config FCOE
> tristate "FCoE module"
> - depends on SCSI
> + depends on PCI
> select LIBFC
> ---help---
> Fibre Channel over Ethernet module

OK, that works for me. Ack. Thanks.

--
~Randy