From nobody Fri Nov 4 22:55:53 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 4N3wvt07n5z4h0XX; Fri, 4 Nov 2022 22:55:54 +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 4N3wvs674Rz40j3; Fri, 4 Nov 2022 22:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667602553; 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=vUsqn/5ufbOdq5f8L57b6m8MGrez8/vcAfus/hICqqA=; b=drzBQ+uVoxeW1+copCIHPLk5AR+NQYzSzkK5PbNOOlw2dNeL1PFXooJ+jKM+a0SETE/2gk AM/XYx9A1tuxrVmFGZUzS+osnzfrJWhfP7Ld9emfMfKTG52Cva/xRncfy/jvqfgjFBB6jN biclYcN8wgmsJ7X7fpcPVdZTqmJBk3TEKkFy7G1S3ZteB1y379ZX1ee7UpVUw6n17nAVMX rIW6uio93FIxtbf4rpFGQIRlzeisQAoW57kZy45rzJLWpufZawC4djp0b+9cQ7doQcGxAY L5OZHShaht6ozDoqY4Mr40OEvSKa6dnNcxqtBnnVbEothEmDnmW85Xk3OXTooA== 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 4N3wvs4phtzJwN; Fri, 4 Nov 2022 22:55:53 +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 2A4Mtrfc032718; Fri, 4 Nov 2022 22:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4MtrWB032717; Fri, 4 Nov 2022 22:55:53 GMT (envelope-from git) Date: Fri, 4 Nov 2022 22:55:53 GMT Message-Id: <202211042255.2A4MtrWB032717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 72e9dbb58cad - main - if_bnxt: Remove sysctl node vlan_only which is not being used 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72e9dbb58cad5262190cf2eae47f764021072128 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667602553; 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=vUsqn/5ufbOdq5f8L57b6m8MGrez8/vcAfus/hICqqA=; b=TIXXjmApqluH/aghRogIqpvy22720kJgaRW9vOoHms6dlOSNxsafXjREg2o9j15Pgc/059 7XUiMN8YLzhlu0qq6hsAeo7PegGaDcOJ7YW9lHaffseCAnWMCb/sDGZKC1vF8/Y5ZxmZ7e iH8Ty8ZLF/1eDRRAoM+oGvejVEltDRJaWR+vhhLi+csGU45NMnnxoDlmLZpcKLPqFCtUT1 9HVbEDQD6pnrNhs9oASagMZvOgGPNYDncVMGIJsk+CoSH5htFR65UfsfdADmeco6eW2OdZ ZW9FPw6v/VzQo2GwrVAH+Ds81k1t8G0Hg0BB0RbV6eddt7Uqj1GNhaLqprrqpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667602553; a=rsa-sha256; cv=none; b=x88bkVwVIFouoaJ7nWBU0a6gWrQsGVRU5cI9ytDhpAYAkB8E4PFlyvf3C4Br7FJdHY4RY+ on5DGkf78EOpy0AK49CaX+3UjRkXS+CwEtBCeuvK9Um/bdKW0nNh7Yvs9VNlFDO2lRo6hQ Df9FFioo/aInrtNEA6jxyspoVo69GWrslzbe1GMj3OzkiMOmOG2PY28l2e1nmRwU0x/hUl Q3EtAAIByboJmJCVpY/0DhlSlYialVPeldJUkPAeIJW7DD7BVq8MuQPHA0i2v8atAYiKU6 ZIfn3BKxo/hOQsR4nlMQEhbHmboWG3ITYd/Lx62wNOZ5nJKs8zGy6rEvw4gGBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=72e9dbb58cad5262190cf2eae47f764021072128 commit 72e9dbb58cad5262190cf2eae47f764021072128 Author: Sumit Saxena AuthorDate: 2022-11-04 22:26:03 +0000 Commit: Warner Losh CommitDate: 2022-11-04 22:26:03 +0000 if_bnxt: Remove sysctl node vlan_only which is not being used Removed sysctl node vlan_only which is not being used after migrating from l2_set_rx_mask to l2_filter_alloc. Reviewed by: imp Differential Revsion: https://reviews.freebsd.org/D36444 --- sys/dev/bnxt/bnxt.h | 1 - sys/dev/bnxt/bnxt_sysctl.c | 38 +------------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 4cf93f1c7eeb..f8f3f4ccc2f5 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -408,7 +408,6 @@ struct bnxt_vnic_info { uint16_t mru; uint32_t rx_mask; - bool vlan_only; struct iflib_dma_info mc_list; int mc_list_count; #define BNXT_MAX_MC_ADDRS 16 diff --git a/sys/dev/bnxt/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_sysctl.c index 36afed71a726..677dc2c1c0c1 100644 --- a/sys/dev/bnxt/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_sysctl.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "bnxt_hwrm.h" #include "bnxt_sysctl.h" -static int bnxt_vlan_only_sysctl(SYSCTL_HANDLER_ARGS); /* * We want to create: * dev.bnxt.0.hwstats.txq0 @@ -1388,45 +1387,10 @@ bnxt_create_hw_lro_sysctls(struct bnxt_softc *softc) return 0; } -static int -bnxt_vlan_only_sysctl(SYSCTL_HANDLER_ARGS) { - struct bnxt_softc *softc = arg1; - int rc; - int val; - - if (softc == NULL) - return EBUSY; - - val = softc->vnic_info.vlan_only; - rc = sysctl_handle_int(oidp, &val, 0, req); - if (rc || !req->newptr) - return rc; - - if (val) - val = 1; - - if (val != softc->vnic_info.vlan_only) { - softc->vnic_info.vlan_only = val; - if (if_getdrvflags(iflib_get_ifp(softc->ctx)) & IFF_DRV_RUNNING) - rc = bnxt_hwrm_cfa_l2_set_rx_mask(softc, - &softc->vnic_info); - } - - return rc; -} int bnxt_create_config_sysctls_post(struct bnxt_softc *softc) { - struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(softc->dev); - struct sysctl_oid_list *children; - - children = SYSCTL_CHILDREN(device_get_sysctl_tree(softc->dev)); - - SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "vlan_only", - CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, softc, 0, - bnxt_vlan_only_sysctl, "I", - "require vlan tag on received packets when vlan is enabled"); - + /* Nothing for now, meant for future expansion */ return 0; }