From owner-svn-src-all@freebsd.org Thu Oct 3 04:41:58 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9271FFF237; Thu, 3 Oct 2019 04:41:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46kL2G3QD0z4Trv; Thu, 3 Oct 2019 04:41:58 +0000 (UTC) (envelope-from glebius@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 58F0D6C63; Thu, 3 Oct 2019 04:41:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x934fwIA097377; Thu, 3 Oct 2019 04:41:58 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x934fwUV097376; Thu, 3 Oct 2019 04:41:58 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201910030441.x934fwUV097376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 3 Oct 2019 04:41:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353030 - head/sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netgraph X-SVN-Commit-Revision: 353030 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2019 04:41:58 -0000 Author: glebius Date: Thu Oct 3 04:41:57 2019 New Revision: 353030 URL: https://svnweb.freebsd.org/changeset/base/353030 Log: Fix build failure from r353026. Somehow module build allowed this. Pointy hat to: glebius Modified: head/sys/netgraph/ng_bridge.c Modified: head/sys/netgraph/ng_bridge.c ============================================================================== --- head/sys/netgraph/ng_bridge.c Thu Oct 3 02:59:30 2019 (r353029) +++ head/sys/netgraph/ng_bridge.c Thu Oct 3 04:41:57 2019 (r353030) @@ -372,13 +372,14 @@ ng_bridge_newhook(node_p node, hook_p hook, const char * Receive a control message */ static int -ng_bridge_reset_link(hook_p hook, int ret) +ng_bridge_reset_link(hook_p hook, void *arg __unused) { link_p priv = NG_HOOK_PRIVATE(hook); priv->loopCount = 0; bzero(&priv->stats, sizeof(priv->stats)); - return (ret); + + return (1); } @@ -429,7 +430,8 @@ ng_bridge_rcvmsg(node_p node, item_p item, hook_p last ng_bridge_remove_hosts(priv, NULL); /* Reset all loop detection counters and stats */ - NG_NODE_FOREACH_HOOK(node, ng_bridge_reset_link, 1, rethook); + NG_NODE_FOREACH_HOOK(node, ng_bridge_reset_link, NULL, + rethook); break; } case NGM_BRIDGE_GET_STATS: @@ -530,8 +532,9 @@ struct ng_bridge_send_ctx { }; static int -ng_bridge_send_ctx(hook_p dst, struct ng_bridge_send_ctx * ctx) +ng_bridge_send_ctx(hook_p dst, void *arg) { + struct ng_bridge_send_ctx *ctx = arg; link_p destLink = NG_HOOK_PRIVATE(dst); struct mbuf *m2 = NULL; int error = 0; @@ -959,11 +962,12 @@ ng_bridge_remove_hosts(priv_p priv, link_p link) * the hashtable whom we haven't heard from in a long while. */ static int -ng_bridge_unmute(hook_p hook, int *counter) +ng_bridge_unmute(hook_p hook, void *arg) { link_p link = NG_HOOK_PRIVATE(hook); node_p node = NG_HOOK_NODE(hook); priv_p priv = NG_NODE_PRIVATE(node); + int *counter = arg; if (link->loopCount != 0) { link->loopCount--;