From owner-svn-ports-all@freebsd.org Mon Jul 20 06:10:04 2020 Return-Path: Delivered-To: svn-ports-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 6676F372FDC; Mon, 20 Jul 2020 06:10:04 +0000 (UTC) (envelope-from ale@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4B9BCc24cyz4Vy3; Mon, 20 Jul 2020 06:10:04 +0000 (UTC) (envelope-from ale@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 2B37482ED; Mon, 20 Jul 2020 06:10:04 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06K6A3ig006427; Mon, 20 Jul 2020 06:10:03 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06K6A3LM006426; Mon, 20 Jul 2020 06:10:03 GMT (envelope-from ale@FreeBSD.org) Message-Id: <202007200610.06K6A3LM006426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Mon, 20 Jul 2020 06:10:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542611 - head/net/realtek-re-kmod/files X-SVN-Group: ports-head X-SVN-Commit-Author: ale X-SVN-Commit-Paths: head/net/realtek-re-kmod/files X-SVN-Commit-Revision: 542611 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2020 06:10:04 -0000 Author: ale Date: Mon Jul 20 06:10:03 2020 New Revision: 542611 URL: https://svnweb.freebsd.org/changeset/ports/542611 Log: Try to fix build on -CURRENT. Modified: head/net/realtek-re-kmod/files/patch-if__re.c Modified: head/net/realtek-re-kmod/files/patch-if__re.c ============================================================================== --- head/net/realtek-re-kmod/files/patch-if__re.c Mon Jul 20 05:48:15 2020 (r542610) +++ head/net/realtek-re-kmod/files/patch-if__re.c Mon Jul 20 06:10:03 2020 (r542611) @@ -115,18 +115,54 @@ } switch(sc->re_type) { -@@ -8640,7 +8644,9 @@ struct re_softc *sc; +@@ -8614,6 +8618,22 @@ struct re_softc *sc; + return; + } + ++#if OS_VER >= VERSION(13,0) ++static u_int ++re_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) ++{ ++ uint32_t h, *hashes = arg; ++ ++ h = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26; ++ if (h < 32) ++ hashes[0] |= (1 << h); ++ else ++ hashes[1] |= (1 << (h - 32)); ++ ++ return (1); ++} ++#endif ++ + /* + * Program the 64-bit multicast hash filter. + */ +@@ -8623,7 +8643,9 @@ struct re_softc *sc; + struct ifnet *ifp; + int h = 0; + u_int32_t hashes[2] = { 0, 0 }; ++#if OS_VER <= VERSION(13,0) + struct ifmultiaddr *ifma; ++#endif + u_int32_t rxfilt; + int mcnt = 0; + +@@ -8640,7 +8662,12 @@ struct re_softc *sc; } /* now program new ones */ -#if OS_VER > VERSION(6,0) ++#if OS_VER >= VERSION(13,0) ++ if_foreach_llmaddr(ifp, re_hash_maddr, hashes); ++#else +#if OS_VER >= VERSION(12,0) + if_maddr_rlock(ifp); +#elif OS_VER > VERSION(6,0) IF_ADDR_LOCK(ifp); #endif #if OS_VER < VERSION(4,9) -@@ -8662,7 +8668,9 @@ struct re_softc *sc; +@@ -8662,8 +8689,11 @@ struct re_softc *sc; hashes[1] |= (1 << (h - 32)); mcnt++; } @@ -135,5 +171,7 @@ + if_maddr_runlock(ifp); +#elif OS_VER > VERSION(6,0) IF_ADDR_UNLOCK(ifp); ++#endif #endif + if (mcnt) {