From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 13:14:38 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD1A42D5; Mon, 12 Jan 2015 13:14:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFBECBDC; Mon, 12 Jan 2015 13:14:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0CDEc2r003672; Mon, 12 Jan 2015 13:14:38 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0CDEcDG003671; Mon, 12 Jan 2015 13:14:38 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201501121314.t0CDEcDG003671@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 12 Jan 2015 13:14:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277067 - projects/ifnet/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2015 13:14:39 -0000 Author: glebius Date: Mon Jan 12 13:14:37 2015 New Revision: 277067 URL: https://svnweb.freebsd.org/changeset/base/277067 Log: Rename if_set to mrt6_ifset to avoid collision if ifnet namespace. Modified: projects/ifnet/sys/netinet6/ip6_mroute.h Modified: projects/ifnet/sys/netinet6/ip6_mroute.h ============================================================================== --- projects/ifnet/sys/netinet6/ip6_mroute.h Mon Jan 12 12:34:22 2015 (r277066) +++ projects/ifnet/sys/netinet6/ip6_mroute.h Mon Jan 12 13:14:37 2015 (r277067) @@ -79,16 +79,16 @@ typedef u_short mifi_t; /* type of a mi #define IF_SETSIZE 256 #endif -typedef u_int32_t if_mask; -#define NIFBITS (sizeof(if_mask) * NBBY) /* bits per mask */ +typedef uint32_t mrt6_ifmask; +#define NIFBITS (sizeof(mrt6_ifmask) * NBBY) /* bits per mask */ #ifndef howmany #define howmany(x, y) (((x) + ((y) - 1)) / (y)) #endif -typedef struct if_set { - if_mask ifs_bits[howmany(IF_SETSIZE, NIFBITS)]; -} if_set; +typedef struct mrt6_ifset { + mrt6_ifmask ifs_bits[howmany(IF_SETSIZE, NIFBITS)]; +} mrt6_ifset; #define IF_SET(n, p) ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS))) #define IF_CLR(n, p) ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS))) @@ -114,7 +114,7 @@ struct mf6cctl { struct sockaddr_in6 mf6cc_origin; /* IPv6 origin of mcasts */ struct sockaddr_in6 mf6cc_mcastgrp; /* multicast group associated */ mifi_t mf6cc_parent; /* incoming ifindex */ - struct if_set mf6cc_ifset; /* set of forwarding ifs */ + struct mrt6_ifset mf6cc_ifset; /* set of forwarding ifs */ }; /* @@ -220,7 +220,7 @@ struct mf6c { struct sockaddr_in6 mf6c_origin; /* IPv6 origin of mcasts */ struct sockaddr_in6 mf6c_mcastgrp; /* multicast group associated*/ mifi_t mf6c_parent; /* incoming IF */ - struct if_set mf6c_ifset; /* set of outgoing IFs */ + struct mrt6_ifset mf6c_ifset; /* set of outgoing IFs */ u_quad_t mf6c_pkt_cnt; /* pkt count for src-grp */ u_quad_t mf6c_byte_cnt; /* byte count for src-grp */