Get rid of some gratuitous casts and join some lines.
This commit is contained in:
parent
2fe02c923a
commit
d43d3ae5b8
@ -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;
|
||||
}
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user