revert "s390/net: lcs: use IS_ENABLED() for kconfig detection"
Subsystems (4)
PATCH 1/1 revert "s390/net: lcs: use IS_ENABLED() for kconfig detection"
The referenced patch is causing build errors when ETHERNET=y and FDDI=m. While we work out the preferred patch(es), revert this patch to make the pain go away.
--- drivers/s390/net/lcs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/s390/net/lcs.c +5 -5
@@ -36,7 +36,7 @@#include "lcs.h" -#if !IS_ENABLED (CONFIG_ETHERNET ) && !IS_ENABLED (CONFIG_FDDI ) +#if !defined(CONFIG_ETHERNET ) && !defined(CONFIG_FDDI )#error Cannot compile lcs.c without some net devices switched on.#endif
@@ -1601,14 +1601,14 @@ lcs_startlan_auto(struct lcs_card *card)int rc;LCS_DBF_TEXT (2 , trace,"strtauto" ); -#if IS_ENABLED (CONFIG_ETHERNET ) +#ifdef CONFIG_ETHERNET card->lan_type =LCS_FRAME_TYPE_ENET ; rc =lcs_send_startlan (card,LCS_INITIATOR_TCPIP );if (rc ==0 )return 0 ;#endif -#if IS_ENABLED (CONFIG_FDDI ) +#ifdef CONFIG_FDDI card->lan_type =LCS_FRAME_TYPE_FDDI ; rc =lcs_send_startlan (card,LCS_INITIATOR_TCPIP );if (rc ==0 )
@@ -2139,13 +2139,13 @@ lcs_new_device(struct ccwgroup_device *c goto netdev_out; }switch (card->lan_type) { -#if IS_ENABLED (CONFIG_ETHERNET ) +#ifdef CONFIG_ETHERNET case LCS_FRAME_TYPE_ENET : card->lan_type_trans = eth_type_trans; dev =alloc_etherdev (0 );break ;#endif -#if IS_ENABLED (CONFIG_FDDI ) +#ifdef CONFIG_FDDI case LCS_FRAME_TYPE_FDDI : card->lan_type_trans = fddi_type_trans; dev =alloc_fddidev (0 );
Quoted 13 lines · Randy Dunlap
The referenced patch is causing build errors when ETHERNET=y and FDDI=m. While we work out the preferred patch(es), revert this patch to make the pain go away.
Fixes 128272336120 ("s390/net: lcs: use IS_ENABLED() for kconfig detection")Signed-off-by Randy Dunlap <[email protected]>Reported-by kernel test robot <[email protected]>Link lore.kernel.org/r/[email protected]Cc Alexandra Winter <[email protected]>Cc Wenjia Zhang <[email protected]>Cc Heiko Carstens <[email protected]>
Quoted 8 lines
Cc Vasily Gorbik <[email protected]>Cc Alexander Gordeev <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Sven Schnelle <[email protected]>Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 22 lines · On Thu, 22 Jun 2023 08:54:09 -0700 you wrote:
The referenced patch is causing build errors when ETHERNET=y and FDDI=m. While we work out the preferred patch(es), revert this patch to make the pain go away.
Fixes 128272336120 ("s390/net: lcs: use IS_ENABLED() for kconfig detection")Signed-off-by Randy Dunlap <[email protected]>Reported-by kernel test robot <[email protected]>Link lore.kernel.org/r/[email protected]Cc Alexandra Winter <[email protected]>Cc Wenjia Zhang <[email protected]>Cc Heiko Carstens <[email protected]>Cc Vasily Gorbik <[email protected]>Cc Alexander Gordeev <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Sven Schnelle <[email protected]>Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>
Quoted 1 line
[...]
Here is the summary with links:
- revert "s390/net: lcs: use IS_ENABLED() for kconfig detection"
https://git.kernel.org/netdev/net-next/c/6a11af7c21da
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html