On Mon, 2008-12-29 at 14:08 -0800, Randy Dunlap wrote:
> James Bottomley wrote:
> > On Mon, 2008-12-29 at 13:23 -0800, Randy Dunlap wrote:
> >> From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> >>
> >> Make the CXGB iSCSI driver (that selects the CXGB net driver) have the same
> >> dependencies as the net driver, since kconfig doesn't do that automatically.
> >> Also make it select INET_LRO & FW_LOADER like the net driver does.
> >
> > I thought select of a symbol that selected something else propagated
> > correctly (even if select of a symbol that depends on something else
> > doesn't).
>
> I don't see that happening, at least in this case.
> Sam, can you clarify?
I've verified it works empirically ... and it's behaviour a lot more
than SCSI seems to be relying on. However, confirming and documenting
this as expected behaviour would seem to be in order.
> > If this is untrue, we have several other Kconfig problems in
> > the kernel.
>
> That would not be a surprise.
So, relying on the behaviour, I think this is the fix for the cxgb3i: it
splits the chelsio_t3 depends off so cxgbi3 can depend on them
separately and still select the option.
James
---
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 72a9212..9a18270 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2399,9 +2399,14 @@ config CHELSIO_T1_1G
Enables support for Chelsio's gigabit Ethernet PCI cards. If you
are using only 10G cards say 'N' here.
+config CHELSIO_T3_DEPENDS
+ tristate
+ depends on PCI && INET
+ default y
+
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"
- depends on PCI && INET
+ depends on CHELSIO_T3_DEPENDS
select FW_LOADER
select INET_LRO
help
diff --git a/drivers/scsi/cxgb3i/Kconfig b/drivers/scsi/cxgb3i/Kconfig
index 2762814..bfdcaf5 100644
--- a/drivers/scsi/cxgb3i/Kconfig
+++ b/drivers/scsi/cxgb3i/Kconfig
@@ -1,5 +1,6 @@
config SCSI_CXGB3_ISCSI
tristate "Chelsio S3xx iSCSI support"
+ depends on CHELSIO_T3_DEPENDS
select CHELSIO_T3
select SCSI_ISCSI_ATTRS
---help---
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
