From 64631418c76f9f64f0669c6a1eb8af1e13dcd1fb Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Wed, 13 Jan 2010 01:26:29 +0000 Subject: let's admit it's not 1992 any more. CIDR is around for a long time, even that router vendor doesn't default to classful routing any more, and there really is no point in having a classful netmask and a subnetmask to split it. we still do classful guesses on the netmask if it isn't supplied by userland, but that's about it. i decided to keep ia_netmask and kill ia_subnetmask which makes this diff bigish, the classful ia_netmask wasn't really used all that much. the real changes are in in.c, the rest is mostly s/ia_subnetmask/ia_netmask. ok claudio dlg ryan --- sys/netinet/igmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/netinet/igmp.c') diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 11201f04c8f..6ba84beaec9 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igmp.c,v 1.29 2009/12/15 13:28:23 jsing Exp $ */ +/* $OpenBSD: igmp.c,v 1.30 2010/01/13 01:26:28 henning Exp $ */ /* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */ /* @@ -353,7 +353,7 @@ igmp_input(struct mbuf *m, ...) if ((ip->ip_src.s_addr & IN_CLASSA_NET) == 0) { IFP_TO_IA(ifp, ia); if (ia) - ip->ip_src.s_addr = ia->ia_subnet; + ip->ip_src.s_addr = ia->ia_net; } /* @@ -421,7 +421,7 @@ igmp_input(struct mbuf *m, ...) IFP_TO_IA(ifp, ia); #endif if (ia) - ip->ip_src.s_addr = ia->ia_subnet; + ip->ip_src.s_addr = ia->ia_net; } /* -- cgit v1.2.3