diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -108,11 +108,7 @@ CTRL_EQ_QSIZE = 1024, TX_EQ_QSIZE = 1024, -#if MJUMPAGESIZE != MCLBYTES SW_ZONE_SIZES = 4, /* cluster, jumbop, jumbo9k, jumbo16k */ -#else - SW_ZONE_SIZES = 3, /* cluster, jumbo9k, jumbo16k */ -#endif CL_METADATA_SIZE = CACHE_LINE_SIZE, SGE_MAX_WR_NDESC = SGE_MAX_WR_LEN / EQ_ESIZE, /* max WR size in desc */ diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -567,9 +567,7 @@ } if (largest_rx_cluster != MCLBYTES && -#if MJUMPAGESIZE != MCLBYTES largest_rx_cluster != MJUMPAGESIZE && -#endif largest_rx_cluster != MJUM9BYTES && largest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.largest_rx_cluster value (%d)," @@ -578,9 +576,7 @@ } if (safest_rx_cluster != MCLBYTES && -#if MJUMPAGESIZE != MCLBYTES safest_rx_cluster != MJUMPAGESIZE && -#endif safest_rx_cluster != MJUM9BYTES && safest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.safest_rx_cluster value (%d)," @@ -719,9 +715,7 @@ uint16_t indsz = min(RX_COPY_THRESHOLD - 1, M_INDICATESIZE); static int sw_buf_sizes[] = { MCLBYTES, -#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, -#endif MJUM9BYTES, MJUM16BYTES }; @@ -858,9 +852,7 @@ int i, j, n; static int sw_buf_sizes[] = { /* Sorted by size */ MCLBYTES, -#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, -#endif MJUM9BYTES, MJUM16BYTES };