Re: [BUILD-FAILURE] linux-next: next-20081210 - s390x - lcsdrivers breaks with !CONFIG_IP_MULTICAST

[Heiko Carstens]

On Wed, Dec 10, 2008 at 04:47:40PM +0530, Kamalesh Babulal wrote:
> Hi,
> 
> 	next-20081210 randconfig kernel builds fails with !CONFIG_IP_MULTICAST
> 
> drivers/s390/net/lcs.c: In function 'lcs_new_device':
> drivers/s390/net/lcs.c:2179: error: implicit declaration of function 'lcs_set_multicast_list'
> make[2]: *** [drivers/s390/net/lcs.o] Error 1
> make[1]: *** [drivers/s390/net] Error 2
> make: *** [drivers/s390] Error 2

Thanks for reporting!

This should do the trick:

---
 drivers/s390/net/lcs.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/s390/net/lcs.c
===================================================================
--- linux-2.6.orig/drivers/s390/net/lcs.c
+++ linux-2.6/drivers/s390/net/lcs.c
@@ -69,7 +69,9 @@ static char debug_buffer[255];
 static void lcs_tasklet(unsigned long);
 static void lcs_start_kernel_thread(struct work_struct *);
 static void lcs_get_frames_cb(struct lcs_channel *, struct lcs_buffer *);
+#ifdef CONFIG_IP_MULTICAST
 static int lcs_send_delipm(struct lcs_card *, struct lcs_ipm_list *);
+#endif /* CONFIG_IP_MULTICAST */
 static int lcs_recovery(void *ptr);
 
 /**
@@ -1280,6 +1282,8 @@ out:
 	lcs_clear_thread_running_bit(card, LCS_SET_MC_THREAD);
 	return 0;
 }
+#endif /* CONFIG_IP_MULTICAST */
+
 /**
  * function called by net device to
  * handle multicast address relevant things
@@ -1287,6 +1291,7 @@ out:
 static void
 lcs_set_multicast_list(struct net_device *dev)
 {
+#ifdef CONFIG_IP_MULTICAST
         struct lcs_card *card;
 
         LCS_DBF_TEXT(4, trace, "setmulti");
@@ -1294,9 +1299,9 @@ lcs_set_multicast_list(struct net_device
 
         if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
 		schedule_work(&card->kernel_thread_starter);
+#endif /* CONFIG_IP_MULTICAST */
 }
 
-#endif /* CONFIG_IP_MULTICAST */
 
 static long
 lcs_check_irb_error(struct ccw_device *cdev, struct irb *irb)
--
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/