Commit 6a11af7c authored by Randy Dunlap's avatar Randy Dunlap Committed by Jakub Kicinski
Browse files

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.

Fixes: 12827233 ("s390/net: lcs: use IS_ENABLED() for kconfig detection")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: lore.kernel.org/r/202306202129.pl0AqK8G-lkp@intel.com
Cc: Alexandra Winter <wintera@linux.ibm.com>
Cc: Wenjia Zhang <wenjia@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230622155409.27311-1-rdunlap@infradead.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 28e219ae

drivers/s390/net/lcs.c

+5 −5
Original line number Diff line number Diff line
@@ -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)
@@ -2140,13 +2140,13 @@ lcs_new_device(struct ccwgroup_device *ccwgdev) 
		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);