Date: Sat, 31 Dec 2011 20:26:05 +0000 (UTC) From: Matthew D Fleming <mdf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r229155 - stable/7/sys/dev/ixgbe Message-ID: <201112312026.pBVKQ5TF081823@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mdf Date: Sat Dec 31 20:26:05 2011 New Revision: 229155 URL: http://svn.freebsd.org/changeset/base/229155 Log: MFC r228440: Consistently use types in ixgbe driver code: - ixgbe_tso_setup() returns a bool, so declare it bool, not boolean_t. - ixgbe_txeof() returns a bool, so declare it bool, not boolean_t. - Do not re-define bool if the symbol already exists. Note this is a partial MFC since ixgbe_tx_ctx_setup() returns more than TRUE/FALSE on stable/7 and ixgbe_header_split tunable does not exist. Modified: stable/7/sys/dev/ixgbe/ixgbe.c stable/7/sys/dev/ixgbe/ixgbe_osdep.h Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/ixgbe/ixgbe.c ============================================================================== --- stable/7/sys/dev/ixgbe/ixgbe.c Sat Dec 31 20:15:46 2011 (r229154) +++ stable/7/sys/dev/ixgbe/ixgbe.c Sat Dec 31 20:26:05 2011 (r229155) @@ -152,7 +152,7 @@ static void ixgbe_dma_free(struct ad static void ixgbe_add_rx_process_limit(struct adapter *, const char *, const char *, int *, int); static int ixgbe_tx_ctx_setup(struct tx_ring *, struct mbuf *); -static boolean_t ixgbe_tso_setup(struct tx_ring *, struct mbuf *, u32 *); +static bool ixgbe_tso_setup(struct tx_ring *, struct mbuf *, u32 *); static void ixgbe_set_ivar(struct adapter *, u16, u8, s8); static void ixgbe_configure_ivars(struct adapter *); static u8 * ixgbe_mc_array_itr(struct ixgbe_hw *, u8 **, u32 *); @@ -3043,7 +3043,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; @@ -3126,7 +3126,7 @@ ixgbe_tso_setup(struct tx_ring *txr, str #else /* For 6.2 RELEASE */ /* This makes it easy to keep the code common */ -static boolean_t +static bool ixgbe_tso_setup(struct tx_ring *txr, struct mbuf *mp, u32 *paylen) { return (FALSE); @@ -3140,7 +3140,7 @@ ixgbe_tso_setup(struct tx_ring *txr, str * 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: stable/7/sys/dev/ixgbe/ixgbe_osdep.h ============================================================================== --- stable/7/sys/dev/ixgbe/ixgbe_osdep.h Sat Dec 31 20:15:46 2011 (r229154) +++ stable/7/sys/dev/ixgbe/ixgbe_osdep.h Sat Dec 31 20:26:05 2011 (r229155) @@ -92,7 +92,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112312026.pBVKQ5TF081823>