From d43d3ae5b80bfe6d9e77f10a32bc8ad7af033960 Mon Sep 17 00:00:00 2001
From: dyoung <dyoung@NetBSD.org>
Date: Wed, 25 Apr 2007 00:11:18 +0000
Subject: [PATCH] Get rid of some gratuitous casts and join some lines.

---
 sys/netinet/igmp.c      | 7 +++----
 sys/netinet/ip_mroute.c | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 52d9b890c6bd..a71944950e24 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: igmp.c,v 1.44 2007/03/12 18:18:35 ad Exp $	*/
+/*	$NetBSD: igmp.c,v 1.45 2007/04/25 00:11:18 dyoung Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.44 2007/03/12 18:18:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.45 2007/04/25 00:11:18 dyoung Exp $");
 
 #include "opt_mrouting.h"
 
@@ -571,8 +571,7 @@ igmp_sendpkt(struct in_multi *inm, int type)
 	imo.imo_multicast_loop = 0;
 #endif /* MROUTING */
 
-	ip_output(m, (struct mbuf *)NULL, (struct route *)NULL,
-	    IP_MULTICASTOPTS, &imo, (struct socket *)NULL);
+	ip_output(m, NULL, NULL, IP_MULTICASTOPTS, &imo, NULL);
 
 	++igmpstat.igps_snd_reports;
 }
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 2b58a9bc186f..b6ccf1d40ba7 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_mroute.c,v 1.101 2007/03/04 06:03:21 christos Exp $	*/
+/*	$NetBSD: ip_mroute.c,v 1.102 2007/04/25 00:11:18 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.101 2007/03/04 06:03:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.102 2007/04/25 00:11:18 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -2219,9 +2219,8 @@ tbf_send_packet(struct vif *vifp, struct mbuf *m)
 		imo.imo_multicast_vif = -1;
 #endif
 
-		error = ip_output(m, (struct mbuf *)NULL, (struct route *)NULL,
-		    IP_FORWARDING|IP_MULTICASTOPTS, &imo,
-		    (struct socket *)NULL);
+		error = ip_output(m, NULL, NULL, IP_FORWARDING|IP_MULTICASTOPTS,
+		    &imo, NULL);
 
 		if (mrtdebug & DEBUG_XMIT)
 			log(LOG_DEBUG, "phyint_send on vif %ld err %d\n",