From nobody Thu Jan 19 03:52:19 2023 X-Original-To: dev-commits-src-branches@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 4Ny7xH74QSz2svCM; Thu, 19 Jan 2023 03:52:19 +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 4Ny7xH5tMTz3j71; Thu, 19 Jan 2023 03:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100339; 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=3NqrGG3fEB3GbUdaSa+A4wck2zFBfoCxQ+WsqUtGFh8=; b=Iv+B7+Tkf57Kdu+BnaSi3iKV12JIlMkX+CpcZky6auWHP0qUvZlsfg3uAHa+60dmiOAIRw YFfE4j02/W1HNnxCgpVWkFR3eet1lTSlenJp05KET+C9IqWIlFwknV4s8cnJXLaFvtAwrA 1w7AipRhJRsPUJLW9NrGN8lRe3/yqb/MifGT6rN9mCBNSup4wsJV9W7iIUDiT/AbKDVNLV +ercRxpL8ECiEDyX8ufoLbOwo+4rSRYW26F1qvQQtFz7oqRJ2ThVxyeWDWdKr99Z9h/JPf iQhSxPzgmnuJUQus9GHSkG7B/FQuDuf/wt71a5R+paadS88QQuA3QTmexb6V3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100339; 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=3NqrGG3fEB3GbUdaSa+A4wck2zFBfoCxQ+WsqUtGFh8=; b=Va4NJf4+i9i8fVKiTTjwrkN4gpJTsGF2iBucmA/Xc+PLe0BAEeC5XcFlJk59zkVGMNfikh 2D8gcDLub5inmoHBCTmT1oqf50gUhGBLRhKwmOXhijUfmansUyJMHQWcz3nOab+cfj6QyF kanTQ5nivYkjA13QicrfpGNZ84wZk5G/0RTtiCJEkflzWb4P93fWK3RKoDAIdbxytGBFfE bB480rDbDtDW+1aptn3mqI9yIE6Pd8qn78+hNxBkSZn6Zx/+UNkGX1V2Mr9Ic7XJ4PVtfl ibKuAjHMiC5IhsoJ2ZGyxW2Y8ZtzQaY1aIdJbV3In9JkA1wt1igLCFlirzQQNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674100339; a=rsa-sha256; cv=none; b=k+PLEkrEyKGB1GPuOvjmvRxhma+sH3ADSzyYdn9ZLy9Oo3LpijGwLwn5khmxdbK5KgnECd lFr/ewxIcfbOAS0o0qgcO9qACKAC+TNSp1qgHI550a/trA6fwvmpsHT/x4G/mQcuYhwGK7 1c52Fi306TSLGGI0HLI9TBUPcoP62NNtUmWR8smDHTrtz7EeRySc2Rt7xFjojYb2qrV5yP BftmS9Sed6v78QsfXHEP71HBT99ggnci2SDh3MxfNmSmHxcBQS2Vv9Dj6aPY962XhpIOAW TigdS21M9hTeZuTMtowbTBgVPYvtiydu6MU9Co7U3fwYgt3dGmM0ZN12wmqDlA== 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 4Ny7xH3zT1zcZN; Thu, 19 Jan 2023 03:52:19 +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 30J3qJOC023222; Thu, 19 Jan 2023 03:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30J3qJPf023211; Thu, 19 Jan 2023 03:52:19 GMT (envelope-from git) Date: Thu, 19 Jan 2023 03:52:19 GMT Message-Id: <202301190352.30J3qJPf023211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5fe5b1576347 - stable/13 - if_bnxt: Remove sysctl node vlan_only which is not being used List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5fe5b15763471ce0473abb8ea144a7b9795a8c75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fe5b15763471ce0473abb8ea144a7b9795a8c75 commit 5fe5b15763471ce0473abb8ea144a7b9795a8c75 Author: Sumit Saxena AuthorDate: 2022-11-04 22:26:03 +0000 Commit: Warner Losh CommitDate: 2023-01-19 01:00:06 +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 (cherry picked from commit 72e9dbb58cad5262190cf2eae47f764021072128) --- 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; }