Author: np
Date: Mon Apr 29 01:15:22 2019
New Revision: 346866
URL: https://svnweb.freebsd.org/changeset/base/346866
Log:
MFC r334467:
cxgbe(4): Retire an old check.
Modified:
stable/11/sys/dev/cxgbe/adapter.h
stable/11/sys/dev/cxgbe/t4_l2t.c
stable/11/sys/dev/cxgbe/t4_l2t.h
stable/11/sys/dev/cxgbe/t4_main.c
stable/11/sys/dev/cxgbe/t4_smt.c
stable/11/sys/dev/cxgbe/t4_smt.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/11/sys/dev/cxgbe/adapter.h Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/adapter.h Mon Apr 29 01:15:22 2019
(r346866)
@@ -80,11 +80,6 @@ prefetch(void *x)
#define CTLTYPE_U64 CTLTYPE_QUAD
#endif
-#if (__FreeBSD_version >= 900030) || \
- ((__FreeBSD_version >= 802507) && (__FreeBSD_version < 900000))
-#define SBUF_DRAIN 1
-#endif
-
SYSCTL_DECL(_hw_cxgbe);
struct adapter;
Modified: stable/11/sys/dev/cxgbe/t4_l2t.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_l2t.c Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/t4_l2t.c Mon Apr 29 01:15:22 2019
(r346866)
@@ -255,7 +255,6 @@ do_l2t_write_rpl(struct sge_iq *iq, const struct rss_h
return (0);
}
-#ifdef SBUF_DRAIN
static inline unsigned int
vlan_prio(const struct l2t_entry *e)
{
@@ -333,4 +332,3 @@ skip:
return (rc);
}
-#endif
Modified: stable/11/sys/dev/cxgbe/t4_l2t.h
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_l2t.h Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/t4_l2t.h Mon Apr 29 01:15:22 2019
(r346866)
@@ -104,9 +104,6 @@ t4_l2t_release(struct l2t_entry *e)
atomic_add_int(&d->nfree, 1);
}
-
-#ifdef SBUF_DRAIN
int sysctl_l2t(SYSCTL_HANDLER_ARGS);
-#endif
#endif /* __T4_L2T_H */
Modified: stable/11/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_main.c Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/t4_main.c Mon Apr 29 01:15:22 2019
(r346866)
@@ -632,7 +632,6 @@ static int sysctl_fec(SYSCTL_HANDLER_ARGS);
static int sysctl_autoneg(SYSCTL_HANDLER_ARGS);
static int sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS);
static int sysctl_temperature(SYSCTL_HANDLER_ARGS);
-#ifdef SBUF_DRAIN
static int sysctl_loadavg(SYSCTL_HANDLER_ARGS);
static int sysctl_cctrl(SYSCTL_HANDLER_ARGS);
static int sysctl_cim_ibq_obq(SYSCTL_HANDLER_ARGS);
@@ -663,7 +662,6 @@ static int sysctl_tx_rate(SYSCTL_HANDLER_ARGS);
static int sysctl_ulprx_la(SYSCTL_HANDLER_ARGS);
static int sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_tc_params(SYSCTL_HANDLER_ARGS);
-#endif
#ifdef TCP_OFFLOAD
static int sysctl_tls_rx_ports(SYSCTL_HANDLER_ARGS);
static int sysctl_tp_tick(SYSCTL_HANDLER_ARGS);
@@ -5730,7 +5728,6 @@ t4_sysctls(struct adapter *sc)
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "core_vdd", CTLFLAG_RD,
&sc->params.core_vdd, 0, "core Vdd (in mV)");
-#ifdef SBUF_DRAIN
/*
* dev.t4nex.X.misc. Marked CTLFLAG_SKIP to avoid information overload.
*/
@@ -5904,7 +5901,6 @@ t4_sysctls(struct adapter *sc)
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_wcwr_stats, "A", "write combined work requests");
}
-#endif
#ifdef TCP_OFFLOAD
if (is_offload(sc)) {
@@ -6188,11 +6184,9 @@ cxgbe_sysctls(struct port_info *pi)
&tc->flags, 0, "flags");
SYSCTL_ADD_UINT(ctx, children2, OID_AUTO, "refcount",
CTLFLAG_RD, &tc->refcount, 0, "references to this class");
-#ifdef SBUF_DRAIN
SYSCTL_ADD_PROC(ctx, children2, OID_AUTO, "params",
CTLTYPE_STRING | CTLFLAG_RD, sc, (pi->port_id << 16) | i,
sysctl_tc_params, "A", "traffic class parameters");
-#endif
}
/*
@@ -6813,7 +6807,6 @@ sysctl_temperature(SYSCTL_HANDLER_ARGS)
return (rc);
}
-#ifdef SBUF_DRAIN
static int
sysctl_loadavg(SYSCTL_HANDLER_ARGS)
{
@@ -8861,7 +8854,6 @@ done:
return (rc);
}
-#endif
#ifdef TCP_OFFLOAD
static int
Modified: stable/11/sys/dev/cxgbe/t4_smt.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_smt.c Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/t4_smt.c Mon Apr 29 01:15:22 2019
(r346866)
@@ -287,7 +287,6 @@ do_smt_write_rpl(struct sge_iq *iq, const struct rss_h
return (0);
}
-#ifdef SBUF_DRAIN
static char
smt_state(const struct smt_entry *e)
{
@@ -343,4 +342,3 @@ skip:
return (rc);
}
-#endif
Modified: stable/11/sys/dev/cxgbe/t4_smt.h
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_smt.h Mon Apr 29 01:10:57 2019
(r346865)
+++ stable/11/sys/dev/cxgbe/t4_smt.h Mon Apr 29 01:15:22 2019
(r346866)
@@ -84,9 +84,6 @@ t4_smt_release(struct smt_entry *e)
}
-
-#ifdef SBUF_DRAIN
int sysctl_smt(SYSCTL_HANDLER_ARGS);
-#endif
#endif /* __T4_SMT_H */
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
