The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=097e192a9c203d98c0b097d1517f87342896f676
commit 097e192a9c203d98c0b097d1517f87342896f676
Author: Elliott Mitchell <ehem+free...@m5p.com>
AuthorDate: 2022-06-23 00:53:47 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2023-02-04 16:13:08 +0000
iavf: purge EOL release compatibility
Drop code that differentiated between FreeBSD 10 and 11
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/603
Differential Revision: https://reviews.freebsd.org/D35560
---
sys/dev/iavf/iavf_lib.c | 4 ----
sys/dev/iavf/iavf_lib.h | 15 ---------------
2 files changed, 19 deletions(-)
diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c
index 61de2a438c12..a7363c7e873a 100644
--- a/sys/dev/iavf/iavf_lib.c
+++ b/sys/dev/iavf/iavf_lib.c
@@ -986,11 +986,7 @@ iavf_media_change_common(if_t ifp)
void
iavf_set_initial_baudrate(if_t ifp)
{
-#if __FreeBSD_version >= 1100000
if_setbaudrate(ifp, IF_Gbps(40));
-#else
- if_initbaudrate(ifp, IF_Gbps(40));
-#endif
}
/**
diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h
index d0e1d6e53c2d..3238219775d8 100644
--- a/sys/dev/iavf/iavf_lib.h
+++ b/sys/dev/iavf/iavf_lib.h
@@ -206,7 +206,6 @@ MALLOC_DECLARE(M_IAVF);
IAVF_DEFAULT_ADV_RSS_HENA)
/* Pre-11 counter(9) compatibility */
-#if __FreeBSD_version >= 1100036
#define IAVF_SET_IPACKETS(vsi, count) (vsi)->ipackets = (count)
#define IAVF_SET_IERRORS(vsi, count) (vsi)->ierrors = (count)
#define IAVF_SET_OPACKETS(vsi, count) (vsi)->opackets = (count)
@@ -219,20 +218,6 @@ MALLOC_DECLARE(M_IAVF);
#define IAVF_SET_IQDROPS(vsi, count) (vsi)->iqdrops = (count)
#define IAVF_SET_OQDROPS(vsi, count) (vsi)->oqdrops = (count)
#define IAVF_SET_NOPROTO(vsi, count) (vsi)->noproto = (count)
-#else
-#define IAVF_SET_IPACKETS(vsi, count) (vsi)->ifp->if_ipackets = (count)
-#define IAVF_SET_IERRORS(vsi, count) (vsi)->ifp->if_ierrors = (count)
-#define IAVF_SET_OPACKETS(vsi, count) (vsi)->ifp->if_opackets = (count)
-#define IAVF_SET_OERRORS(vsi, count) (vsi)->ifp->if_oerrors = (count)
-#define IAVF_SET_COLLISIONS(vsi, count) (vsi)->ifp->if_collisions =
(count)
-#define IAVF_SET_IBYTES(vsi, count) (vsi)->ifp->if_ibytes = (count)
-#define IAVF_SET_OBYTES(vsi, count) (vsi)->ifp->if_obytes = (count)
-#define IAVF_SET_IMCASTS(vsi, count) (vsi)->ifp->if_imcasts = (count)
-#define IAVF_SET_OMCASTS(vsi, count) (vsi)->ifp->if_omcasts = (count)
-#define IAVF_SET_IQDROPS(vsi, count) (vsi)->ifp->if_iqdrops = (count)
-#define IAVF_SET_OQDROPS(vsi, odrops) (vsi)->ifp->if_snd.ifq_drops = (odrops)
-#define IAVF_SET_NOPROTO(vsi, count) (vsi)->noproto = (count)
-#endif
/* For stats sysctl naming */
#define IAVF_QUEUE_NAME_LEN 32
