From nobody Fri Apr 8 00:03:38 2022 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 74CC21A8803A; Fri, 8 Apr 2022 00:03:40 +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 4KZJPR2x1Kz4ksR; Fri, 8 Apr 2022 00:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376219; 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=F5/sNsjLhv8cnPjb50qMRTbG+tkPmx3KD5szuPf10xQ=; b=Vf1U3OExdpWegLvl+kqUVdkMa9YHRgCTf2R1+g0SQ6+VcJBrhRPYY8TFg5ptghg8DbYNR2 ySuEpBrqFK91J0MM3+r6Aae6v5MyLhQorwP9yErqJDoX5xDJ+z4p66SPmdg2QDP2kd3Y6h gp5Jpm9Vz/7+CLYHcGyH5pn3Ojohu35+6rM8FpRRGbtFV4RMHWtLF33QaZih+cu0wNH8TK SxRWlvR7r6PX5J2578RvoBqByFnwgtPy5zlzc2cFSUiE6KlHuqRI4Kk8hLZNlM8AkkNSlQ vHQtB8wDucfcTWTgyB9RrYOdLER8JsVd8esuvGyY1aq3nAp8FBgUZ6UIf6OzPA== 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 69C651A503; Fri, 8 Apr 2022 00:03:38 +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 23803cm6086618; Fri, 8 Apr 2022 00:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803cfk086617; Fri, 8 Apr 2022 00:03:38 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:38 GMT Message-Id: <202204080003.23803cfk086617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9fa72d33d990 - main - qlxgbe: Remove unused variables. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fa72d33d990aab4cb2ffd0d772a9a6596714459 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376219; 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=F5/sNsjLhv8cnPjb50qMRTbG+tkPmx3KD5szuPf10xQ=; b=Cbh+HhPAG6wVRgXxvKlGg5g9ERLRrGtlWJDaOS/7uo1VYO07NSDgbq5b7bo2yd5FKneKVU sDPQ2Flr6Adl7/466dtPJwJlY8w2OIDLhYQY+koVDPPAVx/4FJpVRmvJLTFvFnMCsKRT5f 6987A4VTph02VutKzsmesrafMnv8fyPU4TmhXIN7Go7Je+yDJZfohPQaKbdjcMbP2kgInY EARUe9ZcRyvGvDJGW0+8WJtkqev3oSpHk9XNZaBZBaUNCPsjNu3WSGFL5gseSP2ecECsqa gWeoJ/lUOkl6rA9FbDZaI8nLtsUMDSqcuLdjhMAWTdsdU2IiCCHz71HcZDtMrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376219; a=rsa-sha256; cv=none; b=bWnGILE6hgARqoPIf85lz/zrT2X/sEU9Bre1Jprij0xZSX+Git3SykYnhKqPhPntn2U+jW uNoKIWgsOLiCwfXahc6OLndZXQWPb/hdj7hbEfrQGc8VgZdoq2bKp8NMfjOIWZFHmggvsL /gsGcM0eg3QWKyewFP5vRV5GHY6GSon7k3F3vctGF+KxOB+Pg9EkgTPqpqwFgkMZU4nhpo Q2e5o21HzUnux9MxuOEM9TEaj2n941xGiHQvitIAma4bj9m0EERErXI4saY0yfbVFJFPc9 KVCI3QiD9eIAWi/Z3PaH5BLEu83RoFrp4Btx2BQ7hZJMP8bEL8/EJMDcpVDbYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9fa72d33d990aab4cb2ffd0d772a9a6596714459 commit 9fa72d33d990aab4cb2ffd0d772a9a6596714459 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:28 +0000 qlxgbe: Remove unused variables. --- sys/dev/qlxgbe/ql_hw.c | 22 ++++------------------ sys/dev/qlxgbe/ql_os.c | 8 -------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c index e7b91e4666e7..816e86a2c94c 100644 --- a/sys/dev/qlxgbe/ql_hw.c +++ b/sys/dev/qlxgbe/ql_hw.c @@ -2264,9 +2264,6 @@ qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd_t *tx_cmd, uint8_t *hdr) struct tcphdr *th = NULL; uint32_t ehdrlen, hdrlen, ip_hlen, tcp_hlen, tcp_opt_off; uint16_t etype, opcode, offload = 1; - device_t dev; - - dev = ha->pci_dev; eh = mtod(mp, struct ether_vlan_header *); @@ -2330,7 +2327,7 @@ qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd_t *tx_cmd, uint8_t *hdr) break; default: - QL_DPRINT8(ha, (dev, "%s: type!=ip\n", __func__)); + QL_DPRINT8(ha, (ha->pci_dev, "%s: type!=ip\n", __func__)); offload = 0; break; } @@ -2387,11 +2384,8 @@ qla_tx_chksum(qla_host_t *ha, struct mbuf *mp, uint32_t *op_code, struct ip6_hdr *ip6; uint32_t ehdrlen, ip_hlen; uint16_t etype, opcode, offload = 1; - device_t dev; uint8_t buf[sizeof(struct ip6_hdr)]; - dev = ha->pci_dev; - *op_code = 0; if ((mp->m_pkthdr.csum_flags & @@ -2903,14 +2897,11 @@ qla_confirm_9kb_enable(qla_host_t *ha) int ql_init_hw_if(qla_host_t *ha) { - device_t dev; uint32_t i; uint8_t bcast_mac[6]; qla_rdesc_t *rdesc; uint32_t num_msix; - dev = ha->pci_dev; - for (i = 0; i < ha->hw.num_sds_rings; i++) { bzero(ha->hw.dma_buf.sds_ring[i].dma_b, ha->hw.dma_buf.sds_ring[i].size); @@ -4652,7 +4643,7 @@ static int ql_parse_template(qla_host_t *ha) { uint32_t num_of_entries, buff_level, e_cnt, esize; - uint32_t end_cnt, rv = 0; + uint32_t rv = 0; char *dump_buff, *dbuff; int sane_start = 0, sane_end = 0; ql_minidump_template_hdr_t *template_hdr; @@ -4729,9 +4720,6 @@ ql_parse_template(qla_host_t *ha) break; case RDEND: - if (sane_end == 0) { - end_cnt = e_cnt; - } sane_end++; break; @@ -5457,7 +5445,7 @@ ql_pollrd(qla_host_t *ha, ql_minidump_entry_pollrd_t *entry, int ret; int loop_cnt; uint32_t op_count, select_addr, select_value_stride, select_value; - uint32_t read_addr, poll, mask, data_size, data; + uint32_t read_addr, poll, mask, data; uint32_t wait_count = 0; select_addr = entry->select_addr; @@ -5467,7 +5455,6 @@ ql_pollrd(qla_host_t *ha, ql_minidump_entry_pollrd_t *entry, op_count = entry->op_count; poll = entry->poll; mask = entry->mask; - data_size = entry->data_size; for (loop_cnt = 0; loop_cnt < op_count; loop_cnt++) { ret = ql_rdwr_indreg32(ha, select_addr, &select_value, 0); @@ -5524,7 +5511,7 @@ ql_pollrd_modify_write(qla_host_t *ha, { int ret; uint32_t addr_1, addr_2, value_1, value_2, data; - uint32_t poll, mask, data_size, modify_mask; + uint32_t poll, mask, modify_mask; uint32_t wait_count = 0; addr_1 = entry->addr_1; @@ -5535,7 +5522,6 @@ ql_pollrd_modify_write(qla_host_t *ha, poll = entry->poll; mask = entry->mask; modify_mask = entry->modify_mask; - data_size = entry->data_size; ret = ql_rdwr_indreg32(ha, addr_1, &value_1, 0); if (ret) diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c index 4edb6f0bb0dc..2a7a173ece41 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -259,10 +259,8 @@ static void qla_watchdog(void *arg) { qla_host_t *ha = arg; - qla_hw_t *hw; struct ifnet *ifp; - hw = &ha->hw; ifp = ha->ifp; if (ha->qla_watchdog_exit) { @@ -1648,13 +1646,10 @@ static void qla_stop(qla_host_t *ha) { struct ifnet *ifp = ha->ifp; - device_t dev; int i = 0; ql_sp_log(ha, 13, 0, 0, 0, 0, 0, 0); - dev = ha->pci_dev; - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ha->qla_watchdog_pause = 1; @@ -1946,7 +1941,6 @@ int ql_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp) { register struct mbuf *mp = nmp; - struct ifnet *ifp; int ret = 0; uint32_t offset; bus_dma_segment_t segs[1]; @@ -1954,8 +1948,6 @@ ql_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp) QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__)); - ifp = ha->ifp; - if (ha->hw.enable_9kb) mbuf_size = MJUM9BYTES; else