Re: [PATCH] s390 - mark IPv6 support for QETH as broken

[YOSHIFUJI Hideaki / 吉藤英明]

In article <20040709200445.GD11138@xxxxxxxxxxxxxxxxxxxxxxx> (at Fri, 9 Jul 2004 22:04:45 +0200), Bastian Blank <bastian@xxxxxxxxxxxx> says:

> On Sat, Jul 10, 2004 at 05:00:28AM +0900, YOSHIFUJI Hideaki / 吉藤英明 wrote:
> > It is NOT broken at all.
> 
> It does not compile at all.

Okay... Let's remove generate_eui64 part instead.
Something like this. Thanks.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>

Index: drivers/s390/net/Kconfig
===================================================================
RCS file: /cvsroot/usagi/usagi/kernel/linux26/drivers/s390/net/Kconfig,v
retrieving revision 1.1.1.6
diff -u -u -r1.1.1.6 Kconfig
--- linux26/drivers/s390/net/Kconfig	28 Apr 2004 10:12:42 -0000	1.1.1.6
+++ linux26/drivers/s390/net/Kconfig	9 Jul 2004 20:31:06 -0000
@@ -75,7 +75,11 @@
 	help
 	  If CONFIG_QETH is switched on, this option will include IPv6
 	  support in the qeth device driver.
-	
+
+config QETH_IPV6_IFID
+	bool "Broken private inteface identifier support"
+	depends on ((QETH = IPV6) || (QETH && IPV6 = 'y')) && BROKEN
+
 config QETH_VLAN
 	bool "VLAN support for gigabit ethernet"
 	depends on (QETH = VLAN_8021Q) || (QETH && VLAN_8021Q = 'y')
Index: drivers/s390/net/qeth_main.c
===================================================================
RCS file: /cvsroot/usagi/usagi/kernel/linux26/drivers/s390/net/qeth_main.c,v
retrieving revision 1.1.1.5
diff -u -u -r1.1.1.5 qeth_main.c
--- linux26/drivers/s390/net/qeth_main.c	17 Jun 2004 01:22:21 -0000	1.1.1.5
+++ linux26/drivers/s390/net/qeth_main.c	9 Jul 2004 20:31:07 -0000
@@ -4732,6 +4732,7 @@
 }
 
 #ifdef CONFIG_QETH_IPV6
+#ifdef CONFIG_QETH_IPV6_IFID
 int
 qeth_ipv6_generate_eui64(u8 * eui, struct net_device *dev)
 {
@@ -4751,6 +4752,7 @@
 
 }
 #endif
+#endif
 
 static void
 qeth_get_mac_for_ipm(__u32 ipm, char *mac, struct net_device *dev)
@@ -5159,10 +5161,10 @@
 #ifdef CONFIG_QETH_IPV6
 	/*IPv6 address autoconfiguration stuff*/
 	card->dev->dev_id = card->info.unique_id & 0xffff;
+#ifdef CONFIG_QETH_IPV6_IFID
 	if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
 		card->dev->generate_eui64 = qeth_ipv6_generate_eui64;
-
-
+#endif
 #endif
 	dev->hard_header_parse = NULL;
 	dev->set_mac_address = NULL;

--yoshfuji
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/