From owner-svn-src-head@FreeBSD.ORG Mon Dec 12 18:27:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA7701065673; Mon, 12 Dec 2011 18:27:28 +0000 (UTC) (envelope-from mdf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E4748FC1B; Mon, 12 Dec 2011 18:27:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBCIRSJG012851; Mon, 12 Dec 2011 18:27:28 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBCIRSjZ012847; Mon, 12 Dec 2011 18:27:28 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201112121827.pBCIRSjZ012847@svn.freebsd.org> From: Matthew D Fleming Date: Mon, 12 Dec 2011 18:27:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228440 - head/sys/dev/ixgbe X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 12 Dec 2011 18:27:28 -0000 Author: mdf Date: Mon Dec 12 18:27:28 2011 New Revision: 228440 URL: http://svn.freebsd.org/changeset/base/228440 Log: Consistently use types in ixgbe driver code: - {ixgbe,ixv}_header_split is passed to TUNABLE_INT, so delcare it int, not bool. - {ixgbe,ixv}_tx_ctx_setup() returns a boolean value, so declare it bool, not int. - {ixgbe,ixv}_tso_setup() returns a bool, so declare it bool, not boolean_t. - {ixgbe,ixv}_txeof() returns a bool, so declare it bool, not boolean_t. - Do not re-define bool if the symbol already exists. MFC after: 2 weeks Sponsored by: Isilon Systems, LLC Modified: head/sys/dev/ixgbe/ixgbe.c head/sys/dev/ixgbe/ixgbe_osdep.h head/sys/dev/ixgbe/ixv.c Modified: head/sys/dev/ixgbe/ixgbe.c ============================================================================== --- head/sys/dev/ixgbe/ixgbe.c Mon Dec 12 17:33:38 2011 (r228439) +++ head/sys/dev/ixgbe/ixgbe.c Mon Dec 12 18:27:28 2011 (r228440) @@ -265,7 +265,7 @@ TUNABLE_INT("hw.ixgbe.enable_msix", &ixg * it can be a performance win in some workloads, but * in others it actually hurts, its off by default. */ -static bool ixgbe_header_split = FALSE; +static int ixgbe_header_split = FALSE; TUNABLE_INT("hw.ixgbe.hdr_split", &ixgbe_header_split); /* @@ -3066,7 +3066,7 @@ ixgbe_free_transmit_buffers(struct tx_ri * **********************************************************************/ -static boolean_t +static bool ixgbe_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp) { struct adapter *adapter = txr->adapter; @@ -3184,7 +3184,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, * adapters using advanced tx descriptors * **********************************************************************/ -static boolean_t +static bool ixgbe_tso_setup(struct tx_ring *txr, struct mbuf *mp, u32 *paylen) { struct adapter *adapter = txr->adapter; @@ -3348,7 +3348,7 @@ ixgbe_atr(struct tx_ring *txr, struct mb * tx_buffer is put back on the free queue. * **********************************************************************/ -static boolean_t +static bool ixgbe_txeof(struct tx_ring *txr) { struct adapter *adapter = txr->adapter; Modified: head/sys/dev/ixgbe/ixgbe_osdep.h ============================================================================== --- head/sys/dev/ixgbe/ixgbe_osdep.h Mon Dec 12 17:33:38 2011 (r228439) +++ head/sys/dev/ixgbe/ixgbe_osdep.h Mon Dec 12 18:27:28 2011 (r228440) @@ -95,7 +95,9 @@ typedef uint16_t u16; typedef uint32_t u32; typedef int32_t s32; typedef uint64_t u64; +#ifndef __bool_true_false_are_defined typedef boolean_t bool; +#endif #define le16_to_cpu Modified: head/sys/dev/ixgbe/ixv.c ============================================================================== --- head/sys/dev/ixgbe/ixv.c Mon Dec 12 17:33:38 2011 (r228439) +++ head/sys/dev/ixgbe/ixv.c Mon Dec 12 18:27:28 2011 (r228440) @@ -207,7 +207,7 @@ TUNABLE_INT("hw.ixv.flow_control", &ixv_ * it can be a performance win in some workloads, but * in others it actually hurts, its off by default. */ -static bool ixv_header_split = FALSE; +static int ixv_header_split = FALSE; TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split); /* @@ -2374,7 +2374,7 @@ ixv_free_transmit_buffers(struct tx_ring * **********************************************************************/ -static boolean_t +static bool ixv_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp) { struct adapter *adapter = txr->adapter; @@ -2497,7 +2497,7 @@ ixv_tx_ctx_setup(struct tx_ring *txr, st * adapters using advanced tx descriptors * **********************************************************************/ -static boolean_t +static bool ixv_tso_setup(struct tx_ring *txr, struct mbuf *mp, u32 *paylen) { struct adapter *adapter = txr->adapter; @@ -2586,7 +2586,7 @@ ixv_tso_setup(struct tx_ring *txr, struc * tx_buffer is put back on the free queue. * **********************************************************************/ -static boolean_t +static bool ixv_txeof(struct tx_ring *txr) { struct adapter *adapter = txr->adapter;