Date: Mon, 17 May 2010 10:03:38 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 178375 for review Message-ID: <201005171003.o4HA3cmS097154@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178375?ac=10 Change 178375 by zec@zec_nxlab on 2010/05/17 10:03:22 Whitespace / tab cleanup. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#31 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#31 (text+ko) ==== @@ -122,7 +122,7 @@ #define M_HASCL(m) ((m)->m_flags & M_EXT) static VNET_DEFINE(uint32_t, last_tv_sec); /* last time we processed this */ -#define V_last_tv_sec VNET(last_tv_sec) +#define V_last_tv_sec VNET(last_tv_sec) static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast forwarding cache"); @@ -143,24 +143,24 @@ #define MROUTER_LOCK_DESTROY() mtx_destroy(&mrouter_mtx) static VNET_DEFINE(struct mrtstat, mrtstat); -#define V_mrtstat VNET(mrtstat) +#define V_mrtstat VNET(mrtstat) SYSCTL_VNET_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW, &VNET_NAME(mrtstat), mrtstat, "IPv4 Multicast Forwarding Statistics (struct mrtstat, " "netinet/ip_mroute.h)"); static VNET_DEFINE(u_long, mfchash); -#define V_mfchash VNET(mfchash) -#define MFCHASH(a, g) \ +#define V_mfchash VNET(mfchash) +#define MFCHASH(a, g) \ ((((a).s_addr >> 20) ^ ((a).s_addr >> 10) ^ (a).s_addr ^ \ ((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr) & V_mfchash) -#define MFCHASHSIZE 256 +#define MFCHASHSIZE 256 static VNET_DEFINE(u_char*, nexpire); -#define V_nexpire VNET(nexpire) +#define V_nexpire VNET(nexpire) static u_long mfchashsize; /* Hash size */ static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); -#define V_mfchashtbl VNET(mfchashtbl) +#define V_mfchashtbl VNET(mfchashtbl) static struct mtx mfc_mtx; #define MFC_LOCK() mtx_lock(&mfc_mtx) @@ -171,9 +171,9 @@ #define MFC_LOCK_DESTROY() mtx_destroy(&mfc_mtx) static VNET_DEFINE(vifi_t, numvifs); -#define V_numvifs VNET(numvifs) +#define V_numvifs VNET(numvifs) static VNET_DEFINE(struct vif, viftable[MAXVIFS]); -#define V_viftable VNET(viftable) +#define V_viftable VNET(viftable) SYSCTL_VNET_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_RD, &VNET_NAME(viftable), sizeof(V_viftable), "S,vif[MAXVIFS]", "IPv4 Multicast Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)"); @@ -200,25 +200,25 @@ * Pending timeouts are stored in a hash table, the key being the * expiration time. Periodically, the entries are analysed and processed. */ -#define BW_METER_BUCKETS 1024 +#define BW_METER_BUCKETS 1024 static VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); -#define V_bw_meter_timers VNET(bw_meter_timers) +#define V_bw_meter_timers VNET(bw_meter_timers) static struct callout bw_meter_ch; -#define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ +#define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ /* * Pending upcalls are stored in a vector which is flushed when * full, or periodically */ static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); -#define V_bw_upcalls VNET(bw_upcalls) +#define V_bw_upcalls VNET(bw_upcalls) static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ -#define V_bw_upcalls_n VNET(bw_upcalls_n) +#define V_bw_upcalls_n VNET(bw_upcalls_n) static struct callout bw_upcalls_ch; #define BW_UPCALLS_PERIOD (hz) /* periodical flush of bw upcalls */ static VNET_DEFINE(struct pimstat, pimstat); -#define V_pimstat VNET(pimstat) +#define V_pimstat VNET(pimstat) SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); SYSCTL_VNET_STRUCT(_net_inet_pim, PIMCTL_STATS, stats, CTLFLAG_RD, @@ -289,9 +289,9 @@ }; static VNET_DEFINE(vifi_t, reg_vif_num) = VIFI_INVALID; -#define V_reg_vif_num VNET(reg_vif_num) +#define V_reg_vif_num VNET(reg_vif_num) static VNET_DEFINE(struct ifnet, multicast_register_if); -#define V_multicast_register_if VNET(multicast_register_if) +#define V_multicast_register_if VNET(multicast_register_if) /* * Private variables.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005171003.o4HA3cmS097154>