From owner-svn-src-stable@freebsd.org Thu Mar 16 23:18:58 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5A72D10103; Thu, 16 Mar 2017 23:18:58 +0000 (UTC) (envelope-from erj@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 mx1.freebsd.org (Postfix) with ESMTPS id 7D86DF30; Thu, 16 Mar 2017 23:18:58 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2GNIvlC096688; Thu, 16 Mar 2017 23:18:57 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2GNIvNe096684; Thu, 16 Mar 2017 23:18:57 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201703162318.v2GNIvNe096684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Thu, 16 Mar 2017 23:18:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r315434 - stable/10/sys/dev/ixgbe X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2017 23:18:58 -0000 Author: erj Date: Thu Mar 16 23:18:57 2017 New Revision: 315434 URL: https://svnweb.freebsd.org/changeset/base/315434 Log: ixgbe(4): Fix VF build failure on i386 caused by r315333 SYSCTL_ADD_UQUAD on i386 expects a uint64_t pointer, and not an unsigned long pointer. So change the data type of the original variable to u64 (uint64_t) from unsigned long, since the statistics are intended to be 64 bits, anyway. Reported by: Peter Jeremy (peter@rulingia.com) Modified: stable/10/sys/dev/ixgbe/if_ix.c stable/10/sys/dev/ixgbe/if_ixv.c stable/10/sys/dev/ixgbe/ixgbe.h stable/10/sys/dev/ixgbe/ixv.h Modified: stable/10/sys/dev/ixgbe/if_ix.c ============================================================================== --- stable/10/sys/dev/ixgbe/if_ix.c Thu Mar 16 23:08:18 2017 (r315433) +++ stable/10/sys/dev/ixgbe/if_ix.c Thu Mar 16 23:18:57 2017 (r315434) @@ -4488,9 +4488,9 @@ ixgbe_add_hw_stats(struct adapter *adapt SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail", CTLTYPE_UINT | CTLFLAG_RD, txr, sizeof(txr), ixgbe_sysctl_tdt_handler, "IU", "Transmit Descriptor Tail"); - SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "tso_tx", + SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx", CTLFLAG_RD, &txr->tso_tx, "TSO"); - SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "no_tx_dma_setup", + SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "no_tx_dma_setup", CTLFLAG_RD, &txr->no_tx_dma_setup, "Driver tx dma failure in xmit"); SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "no_desc_avail", Modified: stable/10/sys/dev/ixgbe/if_ixv.c ============================================================================== --- stable/10/sys/dev/ixgbe/if_ixv.c Thu Mar 16 23:08:18 2017 (r315433) +++ stable/10/sys/dev/ixgbe/if_ixv.c Thu Mar 16 23:18:57 2017 (r315434) @@ -2290,7 +2290,7 @@ ixv_add_stats_sysctls(struct adapter *ad SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs", CTLFLAG_RD, &(adapter->queues[i].irqs), "IRQs on queue"); SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "no_tx_dma_setup", - CTLFLAG_RD, &txr->no_tx_dma_setup, + CTLFLAG_RD, &(txr->no_tx_dma_setup), "Driver Tx DMA failure in Tx"); SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_no_desc", CTLFLAG_RD, &(txr->no_desc_avail), Modified: stable/10/sys/dev/ixgbe/ixgbe.h ============================================================================== --- stable/10/sys/dev/ixgbe/ixgbe.h Thu Mar 16 23:08:18 2017 (r315433) +++ stable/10/sys/dev/ixgbe/ixgbe.h Thu Mar 16 23:18:57 2017 (r315434) @@ -346,9 +346,9 @@ struct tx_ring { u32 bytes; /* used for AIM */ u32 packets; /* Soft Stats */ - unsigned long tso_tx; - unsigned long no_tx_map_avail; - unsigned long no_tx_dma_setup; + u64 tso_tx; + u64 no_tx_map_avail; + u64 no_tx_dma_setup; u64 no_desc_avail; u64 total_packets; }; Modified: stable/10/sys/dev/ixgbe/ixv.h ============================================================================== --- stable/10/sys/dev/ixgbe/ixv.h Thu Mar 16 23:08:18 2017 (r315433) +++ stable/10/sys/dev/ixgbe/ixv.h Thu Mar 16 23:18:57 2017 (r315434) @@ -347,9 +347,9 @@ struct tx_ring { u32 bytes; /* used for AIM */ u32 packets; /* Soft Stats */ - unsigned long tso_tx; - unsigned long no_tx_map_avail; - unsigned long no_tx_dma_setup; + u64 tso_tx; + u64 no_tx_map_avail; + u64 no_tx_dma_setup; u64 no_desc_avail; u64 total_packets; };