From nobody Fri May 20 17:14:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 532DC1B343E5; Fri, 20 May 2022 17:14:33 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L4YHX529hz4jDG; Fri, 20 May 2022 17:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wxv5BenDv0yvLerLKEFqjVs9PF1LvYuPAHtDHGs+U40=; b=FMGeTMUGSRyegIUv+9erDDZZ27zD2BUkoLAsNBtVrdjdtiNz9bcLgyg+6mTovcUYy/EgIt RMyoCTvZVF0aw24GVkASUlr2AQ6nC8isU8cgQfAasgUbal8wxMrhd2K9Cl2pGcuaTPnITr fmBDksniwLrNnKXr6EZbSfNLEFyLEyRtWL6oMX+j2rA54weEobFYS4DsmpiQJfBABWuAha yNC6H2UxJVqfW2Hx+U0wEzRMM0NSAADDoo7paaaQ0w9w2XQK9XXu1//9vMFY8416NaFKph N19QCG5UD86Ix/mDwIvgJYgqNIqy91+H22Y10skKrwVvSTb4Inmq//RVJf8LXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D93A16692; Fri, 20 May 2022 17:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24KHEWdk044451; Fri, 20 May 2022 17:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KHEWWJ044450; Fri, 20 May 2022 17:14:32 GMT (envelope-from git) Date: Fri, 20 May 2022 17:14:32 GMT Message-Id: <202205201714.24KHEWWJ044450@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: ad28aec4d627 - main - net/realtek-re-kmod: Remove unused DRIVER_MODULE devclass on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad28aec4d627e45be486e052331eabbdf922cff7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wxv5BenDv0yvLerLKEFqjVs9PF1LvYuPAHtDHGs+U40=; b=cB5btiA9HmUuidWnIf0AXEv3ddyJgqjM4ZpJMnE8s2u49djB1yMGFRmuXbRzO0smzLvh1y LKzXu6BJlMWb8Yg1dBHjKvcxQMj1SG2w9W8YJZV0VC25ftMaGrcxSloyswH9IBRjRMGwl4 EmyqoNYKXYEyzPZLlHvE0Nb3KPK9cnl05NEsKuHUwVoCuhYV0itYW+H9kcY70ie4TCWoAJ 1r78t3zjFwfiHe+c0Q8MN1knCd8l50PPeTkijZ0KBIXyNnU9EGvoT/br9vNU5yA6Ge96ra DFLbD/i+Zi/AbwrVWsWk4mKW8j9P/c4UEXz1iPlvAoTJ/krl7B8O2uPWE1IKpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653066872; a=rsa-sha256; cv=none; b=AcIbzvAY/96Tmmp4JwIprYH91mwgK4IL318V2Moj9MDkZdn2OE/03kPLCpA114lsfpGluZ WkMSIkwNhTX+dBY1ceEB2Y4vVS9DutcjPze9vWvWP6XYruBnuy+9U7qHjl52d9sb7wXr2k N6S8L1WNHJdz4r7ry9MmODRLjSRtSzHeQSyWsMHmRWaj6pLE0a2C6uOOPq0tIwPzcuM4hV EMf9AywcOSzNiw36/W9ZRB+D8yYbF9yKi34w1n2zSx2x40Fg/FcKdYmWgDetiqKnV4Nzix B1uYIj98P8yw3RbothDxW+tElxFyB0fPOK5h4TXufxNkRTfHY45CHwtKM+zP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=ad28aec4d627e45be486e052331eabbdf922cff7 commit ad28aec4d627e45be486e052331eabbdf922cff7 Author: John Baldwin AuthorDate: 2022-05-20 17:12:21 +0000 Commit: John Baldwin CommitDate: 2022-05-20 17:12:21 +0000 net/realtek-re-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: ale (maintainer) Differential Revision: https://reviews.freebsd.org/D35203 --- net/realtek-re-kmod/files/patch-if__re.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/net/realtek-re-kmod/files/patch-if__re.c b/net/realtek-re-kmod/files/patch-if__re.c index b823fa9adc4d..a9c2c8ffc6ba 100644 --- a/net/realtek-re-kmod/files/patch-if__re.c +++ b/net/realtek-re-kmod/files/patch-if__re.c @@ -76,7 +76,21 @@ #define RE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) -@@ -874,9 +888,7 @@ static void re_release_rx_buf(struct re_softc *sc) +@@ -306,9 +320,13 @@ static driver_t re_driver = { + sizeof(struct re_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(if_re, pci, re_driver, 0, 0); ++#else + static devclass_t re_devclass; + + DRIVER_MODULE(if_re, pci, re_driver, re_devclass, 0, 0); ++#endif + + static void + ClearAndSetEthPhyBit( +@@ -874,9 +892,7 @@ static void re_release_rx_buf(struct re_softc *sc) static void re_release_rx_buf(struct re_softc *sc) { @@ -86,7 +100,7 @@ if (sc->re_desc.re_rx_mtag) { for (i = 0; i < RE_RX_BUF_NUM; i++) { -@@ -899,9 +911,7 @@ static void re_release_tx_buf(struct re_softc *sc) +@@ -899,9 +915,7 @@ static void re_release_tx_buf(struct re_softc *sc) } static void re_release_tx_buf(struct re_softc *sc) { @@ -96,7 +110,7 @@ if (sc->re_desc.re_tx_mtag) { for (i = 0; i < RE_TX_BUF_NUM; i++) { -@@ -930,6 +940,7 @@ static int re_alloc_buf(struct re_softc *sc) +@@ -930,6 +944,7 @@ static int re_alloc_buf(struct re_softc *sc) int error =0; int i,size; @@ -104,7 +118,7 @@ error = bus_dma_tag_create(sc->re_parent_tag, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES* RE_NTXSEGS, RE_NTXSEGS, 4096, 0, -@@ -938,6 +949,7 @@ static int re_alloc_buf(struct re_softc *sc) +@@ -938,6 +953,7 @@ static int re_alloc_buf(struct re_softc *sc) if (error) { //device_printf(dev,"re_tx_mtag fail\n"); //goto fail; @@ -112,7 +126,7 @@ return error; } -@@ -955,9 +967,11 @@ static int re_alloc_buf(struct re_softc *sc) +@@ -955,9 +971,11 @@ static int re_alloc_buf(struct re_softc *sc) if (error) { //device_printf(dev,"re_rx_mtag fail\n"); //goto fail; @@ -124,7 +138,7 @@ if (sc->re_rx_mbuf_sz <= MCLBYTES) size = MCLBYTES; else if (sc->re_rx_mbuf_sz <= MJUMPAGESIZE) -@@ -3428,16 +3442,6 @@ is_valid_ether_addr(const u_int8_t * addr) +@@ -3428,16 +3446,6 @@ is_valid_ether_addr(const u_int8_t * addr) return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr); } @@ -141,7 +155,7 @@ static void re_disable_now_is_oob(struct re_softc *sc) { if (sc->re_hw_supp_now_is_oob_ver == 1) -@@ -3889,7 +3893,7 @@ static void re_get_hw_mac_address(struct re_softc *sc, +@@ -3889,7 +3897,7 @@ static void re_get_hw_mac_address(struct re_softc *sc, if (!is_valid_ether_addr(eaddr)) { device_printf(dev,"Invalid ether addr: %6D\n", eaddr, ":"); @@ -150,7 +164,7 @@ device_printf(dev,"Random ether addr: %6D\n", eaddr, ":"); } -@@ -4291,9 +4295,9 @@ static void re_init_software_variable(struct re_softc +@@ -4291,9 +4299,9 @@ static void re_init_software_variable(struct re_softc sc->re_rx_mbuf_sz = sc->max_jumbo_frame_size + ETHER_VLAN_ENCAP_LEN + ETHER_HDR_LEN + ETHER_CRC_LEN + RE_ETHER_ALIGN + 1;