diff options
| author | Anton Blanchard <anton@samba.org> | 2013-08-08 03:47:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 12:47:39 -0400 |
| commit | a271397a97869112f0b77ef7e162f64cf3c55113 (patch) | |
| tree | a625fb8db9b1d4ed9a5861415418b921140d163a | |
| parent | e1a289ee6734dd5f9a81a260f3027ad8010f530a (diff) | |
SCSI: lpfc: Don't force CONFIG_GENERIC_CSUM on
commit f5944daa0a72316077435c18a6571e73ed338332 upstream.
We want ppc64 to be able to select between optimised assembly
checksum routines in big endian and the generic lib/checksum.c
routines in little endian.
The lpfc driver is forcing CONFIG_GENERIC_CSUM on which means
we are unable to make the decision to enable it in the arch
Kconfig. If the option exists it is always forced on.
This got introduced in 3.10 via commit 6a7252fdb0c3 ([SCSI] lpfc:
fix up Kconfig dependencies). I spoke to Randy about it and
the original issue was with CRC_T10DIF not being defined.
As such, remove the select of CONFIG_GENERIC_CSUM.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/scsi/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 86af29f53bbe..1348fa47d127 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1353,7 +1353,6 @@ config SCSI_LPFC | |||
| 1353 | tristate "Emulex LightPulse Fibre Channel Support" | 1353 | tristate "Emulex LightPulse Fibre Channel Support" |
| 1354 | depends on PCI && SCSI | 1354 | depends on PCI && SCSI |
| 1355 | select SCSI_FC_ATTRS | 1355 | select SCSI_FC_ATTRS |
| 1356 | select GENERIC_CSUM | ||
| 1357 | select CRC_T10DIF | 1356 | select CRC_T10DIF |
| 1358 | help | 1357 | help |
| 1359 | This lpfc driver supports the Emulex LightPulse | 1358 | This lpfc driver supports the Emulex LightPulse |