Author: imp
Date: Sun Mar 1 18:17:56 2020
New Revision: 358492
URL: https://svnweb.freebsd.org/changeset/base/358492
Log:
Remove conditional code for FreeBSD 8 and earlier frmo cxgb.
Modified:
head/sys/dev/cxgb/cxgb_osdep.h
head/sys/dev/cxgb/cxgb_sge.c
Modified: head/sys/dev/cxgb/cxgb_osdep.h
==============================================================================
--- head/sys/dev/cxgb/cxgb_osdep.h Sun Mar 1 18:17:51 2020
(r358491)
+++ head/sys/dev/cxgb/cxgb_osdep.h Sun Mar 1 18:17:56 2020
(r358492)
@@ -70,36 +70,10 @@ struct t3_mbuf_hdr {
} while (0)
#endif
-#if __FreeBSD_version < 800054
-#if defined (__GNUC__)
- #if #cpu(i386) || defined __i386 || defined i386 || defined __i386__ ||
#cpu(x86_64) || defined __x86_64__
- #define mb() __asm__ __volatile__ ("mfence;": : :"memory")
- #define wmb() __asm__ __volatile__ ("sfence;": : :"memory")
- #define rmb() __asm__ __volatile__ ("lfence;": : :"memory")
- #elif #cpu(sparc64) || defined sparc64 || defined __sparcv9
- #define mb() __asm__ __volatile__ ("membar #MemIssue": : :"memory")
- #define wmb() mb()
- #define rmb() mb()
- #elif #cpu(sparc) || defined sparc || defined __sparc__
- #define mb() __asm__ __volatile__ ("stbar;": : :"memory")
- #define wmb() mb()
- #define rmb() mb()
-#else
- #define wmb() mb()
- #define rmb() mb()
- #define mb() /* XXX just to make this compile */
- #endif
-#else
- #error "unknown compiler"
-#endif
-#endif
-
/*
* Workaround for weird Chelsio issue
*/
-#if __FreeBSD_version > 700029
#define PRIV_SUPPORTED
-#endif
#define CXGB_TX_CLEANUP_THRESHOLD 32
Modified: head/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- head/sys/dev/cxgb/cxgb_sge.c Sun Mar 1 18:17:51 2020
(r358491)
+++ head/sys/dev/cxgb/cxgb_sge.c Sun Mar 1 18:17:56 2020
(r358492)
@@ -559,7 +559,6 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p)
use_16k = cxgb_use_16k_clusters != -1 ? cxgb_use_16k_clusters :
is_offload(adap);
-#if __FreeBSD_version >= 700111
if (use_16k) {
jumbo_q_size = min(nmbjumbo16/(3*nqsets), JUMBO_Q_SIZE);
jumbo_buf_size = MJUM16BYTES;
@@ -567,10 +566,6 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p)
jumbo_q_size = min(nmbjumbo9/(3*nqsets), JUMBO_Q_SIZE);
jumbo_buf_size = MJUM9BYTES;
}
-#else
- jumbo_q_size = min(nmbjumbop/(3*nqsets), JUMBO_Q_SIZE);
- jumbo_buf_size = MJUMPAGESIZE;
-#endif
while (!powerof2(jumbo_q_size))
jumbo_q_size--;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
