From owner-svn-src-head@freebsd.org Fri Jun 1 01:05:36 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 815F5EF9572; Fri, 1 Jun 2018 01:05:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2EB886B7FC; Fri, 1 Jun 2018 01:05:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CF9121DEA; Fri, 1 Jun 2018 01:05:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5115Zht046312; Fri, 1 Jun 2018 01:05:35 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5115YZT046306; Fri, 1 Jun 2018 01:05:34 GMT (envelope-from np@FreeBSD.org) Message-Id: <201806010105.w5115YZT046306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 1 Jun 2018 01:05:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334467 - head/sys/dev/cxgbe X-SVN-Group: head X-SVN-Commit-Author: np X-SVN-Commit-Paths: head/sys/dev/cxgbe X-SVN-Commit-Revision: 334467 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jun 2018 01:05:36 -0000 Author: np Date: Fri Jun 1 01:05:34 2018 New Revision: 334467 URL: https://svnweb.freebsd.org/changeset/base/334467 Log: cxgbe(4): Retire an old check. Modified: head/sys/dev/cxgbe/adapter.h head/sys/dev/cxgbe/t4_l2t.c head/sys/dev/cxgbe/t4_l2t.h head/sys/dev/cxgbe/t4_main.c head/sys/dev/cxgbe/t4_smt.c head/sys/dev/cxgbe/t4_smt.h Modified: head/sys/dev/cxgbe/adapter.h ============================================================================== --- head/sys/dev/cxgbe/adapter.h Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/adapter.h Fri Jun 1 01:05:34 2018 (r334467) @@ -81,11 +81,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 - struct adapter; typedef struct adapter adapter_t; Modified: head/sys/dev/cxgbe/t4_l2t.c ============================================================================== --- head/sys/dev/cxgbe/t4_l2t.c Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/t4_l2t.c Fri Jun 1 01:05:34 2018 (r334467) @@ -257,7 +257,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) { @@ -335,4 +334,3 @@ skip: return (rc); } -#endif Modified: head/sys/dev/cxgbe/t4_l2t.h ============================================================================== --- head/sys/dev/cxgbe/t4_l2t.h Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/t4_l2t.h Fri Jun 1 01:05:34 2018 (r334467) @@ -106,9 +106,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: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/t4_main.c Fri Jun 1 01:05:34 2018 (r334467) @@ -559,7 +559,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_cctrl(SYSCTL_HANDLER_ARGS); static int sysctl_cim_ibq_obq(SYSCTL_HANDLER_ARGS); static int sysctl_cim_la(SYSCTL_HANDLER_ARGS); @@ -589,7 +588,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); @@ -5572,7 +5570,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. */ @@ -5746,7 +5743,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)) { @@ -6030,11 +6026,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 } /* @@ -6632,7 +6626,6 @@ sysctl_temperature(SYSCTL_HANDLER_ARGS) return (rc); } -#ifdef SBUF_DRAIN static int sysctl_cctrl(SYSCTL_HANDLER_ARGS) { @@ -8641,7 +8634,6 @@ done: return (rc); } -#endif #ifdef TCP_OFFLOAD static int Modified: head/sys/dev/cxgbe/t4_smt.c ============================================================================== --- head/sys/dev/cxgbe/t4_smt.c Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/t4_smt.c Fri Jun 1 01:05:34 2018 (r334467) @@ -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: head/sys/dev/cxgbe/t4_smt.h ============================================================================== --- head/sys/dev/cxgbe/t4_smt.h Fri Jun 1 00:49:20 2018 (r334466) +++ head/sys/dev/cxgbe/t4_smt.h Fri Jun 1 01:05:34 2018 (r334467) @@ -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 */