git: da11f6868e1e - stable/13 - iflib(9): Revert ancillary changes

From: Marius Strobl <marius_at_FreeBSD.org>
Date: Sat, 06 Jan 2024 19:25:22 UTC
The branch stable/13 has been updated by marius:

URL: https://cgit.FreeBSD.org/src/commit/?id=da11f6868e1e29a6cf42911fa1d80fb655ecac92

commit da11f6868e1e29a6cf42911fa1d80fb655ecac92
Author:     Marius Strobl <marius@FreeBSD.org>
AuthorDate: 2024-01-05 21:31:02 +0000
Commit:     Marius Strobl <marius@FreeBSD.org>
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