From owner-svn-src-head@freebsd.org Tue Nov 27 04:05:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A52A11389D0; Tue, 27 Nov 2018 04:05:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A29E980ABA; Tue, 27 Nov 2018 04:05:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7936916024; Tue, 27 Nov 2018 04:05:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAR45cQk044830; Tue, 27 Nov 2018 04:05:38 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAR45cmZ044829; Tue, 27 Nov 2018 04:05:38 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811270405.wAR45cmZ044829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Tue, 27 Nov 2018 04:05:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341006 - head/sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sys/netgraph X-SVN-Commit-Revision: 341006 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A29E980ABA X-Spamd-Result: default: False [1.35 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.25)[0.245,0]; NEURAL_SPAM_MEDIUM(0.64)[0.643,0]; NEURAL_SPAM_LONG(0.47)[0.465,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 04:05:39 -0000 Author: eugen Date: Tue Nov 27 04:05:38 2018 New Revision: 341006 URL: https://svnweb.freebsd.org/changeset/base/341006 Log: ng_source(4): correction after the change r340617 tv_usec has "long" type for all architecture in FreeBSD and follows __LP64__. However, this is not true for tv_sec that has "time_t" type. Since r320347 that changed time_t from 32 to 64 bit integer for 32 bit version of powerpc architecture, we have only single i386 architecture having 32 bit time_t type. Submitted by: jhb MFC after: 1 week. Modified: head/sys/netgraph/ng_source.c Modified: head/sys/netgraph/ng_source.c ============================================================================== --- head/sys/netgraph/ng_source.c Tue Nov 27 00:36:35 2018 (r341005) +++ head/sys/netgraph/ng_source.c Tue Nov 27 04:05:38 2018 (r341006) @@ -125,11 +125,14 @@ 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 __LP64__ +#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_sec", &ng_parse_int32_type }, { "tv_usec", &ng_parse_int32_type }, #endif { NULL }