From owner-svn-src-head@freebsd.org Thu Mar 24 11:40:12 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 643A7ADC13C; Thu, 24 Mar 2016 11:40:12 +0000 (UTC) (envelope-from bz@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 mx1.freebsd.org (Postfix) with ESMTPS id 1C4A11317; Thu, 24 Mar 2016 11:40:12 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2OBeB0L074931; Thu, 24 Mar 2016 11:40:11 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2OBeArJ074927; Thu, 24 Mar 2016 11:40:10 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201603241140.u2OBeArJ074927@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Thu, 24 Mar 2016 11:40:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297234 - in head/sys: net netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 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: Thu, 24 Mar 2016 11:40:12 -0000 Author: bz Date: Thu Mar 24 11:40:10 2016 New Revision: 297234 URL: https://svnweb.freebsd.org/changeset/base/297234 Log: Fix compile errors after r297225: - properly V_irtualise variable access unbreaking VIMAGE kernels. - remove the volatile from the function return type to make architecture using gcc happy [-Wreturn-type] "type qualifiers ignored on function return type" I am not entirely happy with this solution putting the u_int there but it will do for now. Modified: head/sys/net/route.c head/sys/net/route.h head/sys/netinet/tcp_subr.c head/sys/netinet/udp_usrreq.c Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Thu Mar 24 11:38:18 2016 (r297233) +++ head/sys/net/route.c Thu Mar 24 11:40:10 2016 (r297234) @@ -201,7 +201,7 @@ rt_tables_get_rnh(int table, int fam) return (*rt_tables_get_rnh_ptr(table, fam)); } -rt_gen_t +u_int rt_tables_get_gen(int table, int fam) { struct rib_head *rnh; Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Thu Mar 24 11:38:18 2016 (r297233) +++ head/sys/net/route.h Thu Mar 24 11:40:10 2016 (r297234) @@ -437,7 +437,7 @@ int rt_setgate(struct rtentry *, struct void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); struct rib_head *rt_table_init(int); void rt_table_destroy(struct rib_head *); -rt_gen_t rt_tables_get_gen(int table, int fam); +u_int rt_tables_get_gen(int table, int fam); int rtsock_addrmsg(int, struct ifaddr *, int); int rtsock_routemsg(int, struct ifnet *ifp, int, struct rtentry *, int); Modified: head/sys/netinet/tcp_subr.c ============================================================================== --- head/sys/netinet/tcp_subr.c Thu Mar 24 11:38:18 2016 (r297233) +++ head/sys/netinet/tcp_subr.c Thu Mar 24 11:40:10 2016 (r297234) @@ -1932,7 +1932,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s notify = tcp_drop_syn_sent; else if (PRC_IS_REDIRECT(cmd)) { /* signal EHOSTDOWN, as it flushes the cached route */ - in_pcbnotifyall(&tcbinfo, faddr, EHOSTDOWN, notify); + in_pcbnotifyall(&V_tcbinfo, faddr, EHOSTDOWN, notify); return; } /* Modified: head/sys/netinet/udp_usrreq.c ============================================================================== --- head/sys/netinet/udp_usrreq.c Thu Mar 24 11:38:18 2016 (r297233) +++ head/sys/netinet/udp_usrreq.c Thu Mar 24 11:40:10 2016 (r297234) @@ -768,7 +768,7 @@ udp_common_ctlinput(int cmd, struct sock if (PRC_IS_REDIRECT(cmd)) { /* signal EHOSTDOWN, as it flushes the cached route */ - in_pcbnotifyall(&udbinfo, faddr, EHOSTDOWN, udp_notify); + in_pcbnotifyall(&V_udbinfo, faddr, EHOSTDOWN, udp_notify); return; }