From nobody Sat Jan 06 19:25:22 2024 X-Original-To: dev-commits-src-all@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 4T6qzQ3Qk7z571HC; Sat, 6 Jan 2024 19:25:22 +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 4T6qzQ2y7Bz3wrR; Sat, 6 Jan 2024 19:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569122; 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=Fj2o2OMzelv4+EZ5TcCzo+MpOXA54KQCz4WfwUJu6T0=; b=ppIfIxGicI4yaWML3g0EJIrz2dcwjH/r2uQihC0t/BVMvbv46lmv1m80G+bIXgDpYYm6n5 BlobBHonxPWtNZSFEWz4DEwkxd+n3u9hh/RzfBl8AqlNMXCArfY5J3lKOD/uePqussUs3V CixkcxBxW80eAoUGEUJ/ykAITCvEKawDH2cQo/OO4d+IMEf7+yd2ejhiirJDvOjHdgs0NH DBnDUtyqsiGdv86sbsgVHiEnU6+L9GuU5B9SUt373So24XgAoJCZHVepFxTH/XVdOgEx4z 6KtcvDN03carffYGTg83TjLuA+YYbHM7peSgd91VnPTzEHKZOQhtMn3R0G02/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569122; 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=Fj2o2OMzelv4+EZ5TcCzo+MpOXA54KQCz4WfwUJu6T0=; b=D6iVdUCL2yx14amSXIMEcINLMlRXLrqZI0uYzUVHENPKF3v8G+j3IQkr8HaIdLzk7WTsXj n8EaefPg7X2kkeCsy5yQvxlAjGUE3hwRNd8DxEGB9QDMqEL3FhmQk9awqgT5EwKbUT7wy+ eNxuHIcpqhxOiohGernv9uhM+Ll7xiZltkQC3DuDC97RD7AIsI8rwOhVmGGsj88enoCcjr nDEjGjq2lOgKgM31xmqrgWOFcWB0n2lAsieTgRsYOmcin6Fv789iN2TdBcprraHJwWkmsA iIdMJZZ3KPkrO1MMCiHTxXlvWlHa/sbH9jyD8NRqyOkhNFSXiGVgsCJYNHWygg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704569122; a=rsa-sha256; cv=none; b=QtwQB7SYnzSYRSN3Zd0NhnFpCyo7wTv0DOPNfzLvu5Bjjojv5lU4BGV7IV2TrErMuG/q9k UUnIIbrerxGjO3V09v5CGYY22BOOPy+3zH/x95WN+3VsQuqo31xQddRglIdXtTB0rqdSng R0SsYuzOeFowKI0M9H1MV0Ww25ylhFgCAbIhIoIPUH3DzMciZR3n9gEiJnyhpbFt2cXI87 g0JLLzIcdjcCh7wQnVbtPSSPH26qpv8dKfDTez1yEPmf1xytMFQlkb6pwsOEYYkAEK53l5 XRanAxtm35cMgKcbJflI/Z61JDMm7SwWh9o/URg52PHjUS9kAybS2jNhe63wng== 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 4T6qzQ1sk0ztDN; Sat, 6 Jan 2024 19:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 406JPMXk064754; Sat, 6 Jan 2024 19:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406JPM9c064751; Sat, 6 Jan 2024 19:25:22 GMT (envelope-from git) Date: Sat, 6 Jan 2024 19:25:22 GMT Message-Id: <202401061925.406JPM9c064751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: da11f6868e1e - stable/13 - iflib(9): Revert ancillary changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da11f6868e1e29a6cf42911fa1d80fb655ecac92 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=da11f6868e1e29a6cf42911fa1d80fb655ecac92 commit da11f6868e1e29a6cf42911fa1d80fb655ecac92 Author: Marius Strobl AuthorDate: 2024-01-05 21:31:02 +0000 Commit: Marius Strobl CommitDate: 2024-01-05 21:31:02 +0000 iflib(9): Revert ancillary changes In main, 7ff9ae90f reverted 09f6ff4f, i. e. support for cloning pseudo interfaces along with "ancillary changes" part of the original commit. As these latter were never actually used, this change turns the macros into spares in stable/13, too. Thus, when the bits gets reused in main such commits can be merged without conflicts. --- sys/net/iflib.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/net/iflib.h b/sys/net/iflib.h index da6dc23aefd4..a444a4937a3c 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -350,22 +350,10 @@ typedef enum { * Driver needs frames padded to some minimum length */ #define IFLIB_NEED_ETHER_PAD 0x100 -/* - * Packets can be freed immediately after encap - */ -#define IFLIB_TXD_ENCAP_PIO 0x00200 -/* - * Use RX completion handler - */ -#define IFLIB_RX_COMPLETION 0x00400 -/* - * Skip refilling cluster free lists - */ -#define IFLIB_SKIP_CLREFILL 0x00800 -/* - * Don't reset on hang - */ -#define IFLIB_NO_HANG_RESET 0x01000 +#define IFLIB_SPARE7 0x200 +#define IFLIB_SPARE6 0x400 +#define IFLIB_SPARE5 0x800 +#define IFLIB_SPARE4 0x1000 /* * Don't need/want most of the niceties of * queue management