From nobody Fri Dec 03 22:31:34 2021 X-Original-To: dev-commits-src-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 68C4C18C7B04; Fri, 3 Dec 2021 22:31:35 +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 4J5SGv1Mdrz3p1x; Fri, 3 Dec 2021 22:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1019B18D6A; Fri, 3 Dec 2021 22:31:35 +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 1B3MVYJu094999; Fri, 3 Dec 2021 22:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3MVYww094998; Fri, 3 Dec 2021 22:31:34 GMT (envelope-from git) Date: Fri, 3 Dec 2021 22:31:34 GMT Message-Id: <202112032231.1B3MVYww094998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: 74765431b7e9 - main - Fix "set but not used" for the ti driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74765431b7e947254dd428a8cb4e1dcc1618497e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638570695; 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=iw3Q1XQz5hbvhHSWhtxfZHRlaXgo+b3jNm26QmPzxlQ=; b=qykQHNPXAle378FxEV+5mFKxpRtK0QqlGld6NzicZiX+kBI1Bnno7dtM6NZCfAEvbn2DA7 sbG0ffq3CHwCCdokbzFNIZsROULqoAX7xOXMFwM+TwXB/XdIFQ+FJMP8s+QycEjAjVodxe L1AdefpTwBxQlCHW+RvmVqcTd7brETC2hHzpQcZNAaraurcjshuJMeBcJn1x2VlPz+ypr4 Y478VzH4laHYioJ2dI6fGE9nJ9TwgquislOwmRJwXbyG1G5SEjFiJb9/9RgebI8H9ehSfZ mInZiY3I8t90ZYoa/OhBX3yKYe+mGbkobMbkyWS72ufTXVFGza4Mg9GM5GPQZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638570695; a=rsa-sha256; cv=none; b=K5EIFJlKyidjBnC5+Ep+U0Uhk0AoM3UTcSyQy9+FLGAdxSrZ4h89f/nVJDFRKweA+OGQLZ N2hmv7bk+22dcM/EUtn5KzZCNJuMwDQXFHFudDbGRiPexebh4Jzkq5fp6Ok9IhAzHyTRwB c4SjxF+AXcG4nTd83sUea25D5hpNr2XbtnPvYFzxnLCcpKCjuZgxgvF0yNtvhmHXuor9bK viLhDdjwa+F0ZSCeJtxcSnJtScsLVMfONCO1Fb7sxPXksrPF3AJGtoeZOiS/vj4a38uEv3 j4NZBvVBCtABJUXlvVFXGIh1Qcx1cy/tLl/3BeKsqK9Myi/rfRF4h1tJfIGfbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=74765431b7e947254dd428a8cb4e1dcc1618497e commit 74765431b7e947254dd428a8cb4e1dcc1618497e Author: Scott Long AuthorDate: 2021-12-03 22:31:14 +0000 Commit: Scott Long CommitDate: 2021-12-03 22:31:14 +0000 Fix "set but not used" for the ti driver Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/ti/if_ti.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index e8b4eb537883..de173e726f62 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -2220,10 +2220,10 @@ ti_gibinit(struct ti_softc *sc) ti_hostaddr64(&rcb->ti_hostaddr, sc->ti_rdata.ti_rx_std_ring_paddr); rcb->ti_max_len = TI_FRAMELEN; rcb->ti_flags = 0; - if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM) + if (ifp->if_capenable & IFCAP_RXCSUM) rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM | TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM; - if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) + if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST; /* Set up the jumbo receive ring. */ @@ -2237,10 +2237,10 @@ ti_gibinit(struct ti_softc *sc) rcb->ti_max_len = PAGE_SIZE; rcb->ti_flags = TI_RCB_FLAG_USE_EXT_RX_BD; #endif - if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM) + if (ifp->if_capenable & IFCAP_RXCSUM) rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM | TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM; - if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) + if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST; /* @@ -2255,10 +2255,10 @@ ti_gibinit(struct ti_softc *sc) rcb->ti_flags = TI_RCB_FLAG_RING_DISABLED; else rcb->ti_flags = 0; - if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM) + if (ifp->if_capenable & IFCAP_RXCSUM) rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM | TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM; - if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) + if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST; /* @@ -2289,9 +2289,9 @@ ti_gibinit(struct ti_softc *sc) rcb->ti_flags = 0; else rcb->ti_flags = TI_RCB_FLAG_HOST_RING; - if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) + if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST; - if (sc->ti_ifp->if_capenable & IFCAP_TXCSUM) + if (ifp->if_capenable & IFCAP_TXCSUM) rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM | TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM; rcb->ti_max_len = TI_TX_RING_CNT;