Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Jan 2019 09:57:36 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r343022 - stable/11/sys/netgraph
Message-ID:  <201901140957.x0E9vaHa043621@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Mon Jan 14 09:57:36 2019
New Revision: 343022
URL: https://svnweb.freebsd.org/changeset/base/343022

Log:
  MFC r340617,341006: unbreak ng_source(4) for 64-bit platforms

Modified:
  stable/11/sys/netgraph/ng_source.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netgraph/ng_source.c
==============================================================================
--- stable/11/sys/netgraph/ng_source.c	Mon Jan 14 09:54:53 2019	(r343021)
+++ stable/11/sys/netgraph/ng_source.c	Mon Jan 14 09:57:36 2019	(r343022)
@@ -125,8 +125,16 @@ static int		ng_source_dup_mod(sc_p, struct mbuf *,
 
 /* Parse type for timeval */
 static const struct ng_parse_struct_field ng_source_timeval_type_fields[] = {
+#ifdef __i386__
 	{ "tv_sec",		&ng_parse_int32_type	},
+#else
+	{ "tv_sec",		&ng_parse_int64_type	},
+#endif
+#ifdef __LP64__
+	{ "tv_usec",		&ng_parse_int64_type	},
+#else
 	{ "tv_usec",		&ng_parse_int32_type	},
+#endif
 	{ NULL }
 };
 const struct ng_parse_type ng_source_timeval_type = {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901140957.x0E9vaHa043621>