svn commit: r229153 - stable/9/sys/dev/ixgbe

[Matthew D Fleming]

Author: mdf
Date: Sat Dec 31 20:12:26 2011
New Revision: 229153
URL: http://svn.freebsd.org/changeset/base/229153

Log:
  MFC r228440:
  
  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.

Modified:
  stable/9/sys/dev/ixgbe/ixgbe.c
  stable/9/sys/dev/ixgbe/ixgbe_osdep.h
  stable/9/sys/dev/ixgbe/ixv.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixgbe.c	Sat Dec 31 20:06:38 2011	(r229152)
+++ stable/9/sys/dev/ixgbe/ixgbe.c	Sat Dec 31 20:12:26 2011	(r229153)
@@ -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);
 
 /*
@@ -3017,7 +3017,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;
@@ -3135,7 +3135,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;
@@ -3299,7 +3299,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: stable/9/sys/dev/ixgbe/ixgbe_osdep.h
==============================================================================
--- stable/9/sys/dev/ixgbe/ixgbe_osdep.h	Sat Dec 31 20:06:38 2011	(r229152)
+++ stable/9/sys/dev/ixgbe/ixgbe_osdep.h	Sat Dec 31 20:12:26 2011	(r229153)
@@ -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: stable/9/sys/dev/ixgbe/ixv.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixv.c	Sat Dec 31 20:06:38 2011	(r229152)
+++ stable/9/sys/dev/ixgbe/ixv.c	Sat Dec 31 20:12:26 2011	(r229153)
@@ -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;