git: 407912909a71 - main - ixl: purge EOL release compatibility

The branch main has been updated by imp:

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

commit 407912909a71b22d5e381ae9178bcacbcbc0ce45
Author:     Elliott Mitchell <ehem+freebsd@m5p.com>
AuthorDate: 2022-06-23 00:53:47 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-02-04 16:13:08 +0000

    ixl: 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/ixl/if_ixl.c      |  4 ----
 sys/dev/ixl/ixl.h         | 15 ---------------
 sys/dev/ixl/ixl_pf_main.c |  9 ---------
 3 files changed, 28 deletions(-)

diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c
index 9df1d9792e51..8b7d132db7b7 100644
--- a/sys/dev/ixl/if_ixl.c
+++ b/sys/dev/ixl/if_ixl.c
@@ -314,11 +314,7 @@ TUNABLE_INT("hw.ixl.enable_iwarp", &ixl_enable_iwarp);
 SYSCTL_INT(_hw_ixl, OID_AUTO, enable_iwarp, CTLFLAG_RDTUN,
     &ixl_enable_iwarp, 0, "iWARP enabled");
 
-#if __FreeBSD_version < 1100000
-int ixl_limit_iwarp_msix = 1;
-#else
 int ixl_limit_iwarp_msix = IXL_IW_MAX_MSIX;
-#endif
 TUNABLE_INT("hw.ixl.limit_iwarp_msix", &ixl_limit_iwarp_msix);
 SYSCTL_INT(_hw_ixl, OID_AUTO, limit_iwarp_msix, CTLFLAG_RDTUN,
     &ixl_limit_iwarp_msix, 0, "Limit MSI-X vectors assigned to iWARP");
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index 641ce6b10fcc..6b94732fd44e 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -273,7 +273,6 @@
 	(CSUM_IP|CSUM_IP_TSO)
 
 /* Pre-11 counter(9) compatibility */
-#if __FreeBSD_version >= 1100036
 #define IXL_SET_IPACKETS(vsi, count)	(vsi)->ipackets = (count)
 #define IXL_SET_IERRORS(vsi, count)	(vsi)->ierrors = (count)
 #define IXL_SET_OPACKETS(vsi, count)	(vsi)->opackets = (count)
@@ -286,20 +285,6 @@
 #define IXL_SET_IQDROPS(vsi, count)	(vsi)->iqdrops = (count)
 #define IXL_SET_OQDROPS(vsi, count)	(vsi)->oqdrops = (count)
 #define IXL_SET_NOPROTO(vsi, count)	(vsi)->noproto = (count)
-#else
-#define IXL_SET_IPACKETS(vsi, count)	(vsi)->ifp->if_ipackets = (count)
-#define IXL_SET_IERRORS(vsi, count)	(vsi)->ifp->if_ierrors = (count)
-#define IXL_SET_OPACKETS(vsi, count)	(vsi)->ifp->if_opackets = (count)
-#define IXL_SET_OERRORS(vsi, count)	(vsi)->ifp->if_oerrors = (count)
-#define IXL_SET_COLLISIONS(vsi, count)	(vsi)->ifp->if_collisions = (count)
-#define IXL_SET_IBYTES(vsi, count)	(vsi)->ifp->if_ibytes = (count)
-#define IXL_SET_OBYTES(vsi, count)	(vsi)->ifp->if_obytes = (count)
-#define IXL_SET_IMCASTS(vsi, count)	(vsi)->ifp->if_imcasts = (count)
-#define IXL_SET_OMCASTS(vsi, count)	(vsi)->ifp->if_omcasts = (count)
-#define IXL_SET_IQDROPS(vsi, count)	(vsi)->ifp->if_iqdrops = (count)
-#define IXL_SET_OQDROPS(vsi, odrops)	(vsi)->ifp->if_snd.ifq_drops = (odrops)
-#define IXL_SET_NOPROTO(vsi, count)	(vsi)->noproto = (count)
-#endif
 
 /* For stats sysctl naming */
 #define IXL_QUEUE_NAME_LEN 32
diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c
index 7b1bf78dac09..7e9ad20b157b 100644
--- a/sys/dev/ixl/ixl_pf_main.c
+++ b/sys/dev/ixl/ixl_pf_main.c
@@ -2275,16 +2275,7 @@ ixl_stat_update48(struct i40e_hw *hw, u32 hireg, u32 loreg,
 {
 	u64 new_data;
 
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 1000000) && defined(__amd64__)
 	new_data = rd64(hw, loreg);
-#else
-	/*
-	 * Use two rd32's instead of one rd64; FreeBSD versions before
-	 * 10 don't support 64-bit bus reads/writes.
-	 */
-	new_data = rd32(hw, loreg);
-	new_data |= ((u64)(rd32(hw, hireg) & 0xFFFF)) << 32;
-#endif
 
 	if (!offset_loaded)
 		*offset = new_data;