Commit c3033b01 authored by Joe Perches's avatar Joe Perches Committed by Jeff Garzik
Browse files

e1000: Convert boolean_t to bool 



On Thu, 2008-03-06 at 10:07 -0800, Kok, Auke wrote:
> send me a patch for e1000 and for ixgb and I'll happily apply those :)

boolean_t to bool
TRUE to true
FALSE to false
comment typo ahread to ahead

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f89e6e38

drivers/net/e1000/e1000.h

+13 −13
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ struct e1000_tx_ring { 
	spinlock_t tx_lock;

	uint16_t tdh;

	uint16_t tdt;

	boolean_t last_tx_tso;

	bool last_tx_tso;

};



struct e1000_rx_ring {
@@ -283,16 +283,16 @@ struct e1000_adapter { 
	uint32_t tx_fifo_size;

	uint8_t  tx_timeout_factor;

	atomic_t tx_fifo_stall;

	boolean_t pcix_82544;

	boolean_t detect_tx_hung;

	bool pcix_82544;

	bool detect_tx_hung;



	/* RX */

#ifdef CONFIG_E1000_NAPI

	boolean_t (*clean_rx) (struct e1000_adapter *adapter,

	bool (*clean_rx) (struct e1000_adapter *adapter,

			  struct e1000_rx_ring *rx_ring,

			  int *work_done, int work_to_do);

#else

	boolean_t (*clean_rx) (struct e1000_adapter *adapter,

	bool (*clean_rx) (struct e1000_adapter *adapter,

			  struct e1000_rx_ring *rx_ring);

#endif

	void (*alloc_rx_buf) (struct e1000_adapter *adapter,
@@ -312,7 +312,7 @@ struct e1000_adapter { 
	uint32_t alloc_rx_buff_failed;

	uint32_t rx_int_delay;

	uint32_t rx_abs_int_delay;

	boolean_t rx_csum;

	bool rx_csum;

	unsigned int rx_ps_pages;

	uint32_t gorcl;

	uint64_t gorcl_old;
@@ -335,12 +335,12 @@ struct e1000_adapter { 
	struct e1000_rx_ring test_rx_ring;



	int msg_enable;

	boolean_t have_msi;

	bool have_msi;



	/* to not mess up cache alignment, always add to the bottom */

	boolean_t tso_force;

	boolean_t smart_power_down;	/* phy smart power down */

	boolean_t quad_port_a;

	bool tso_force;

	bool smart_power_down;	/* phy smart power down */

	bool quad_port_a;

	unsigned long flags;

	uint32_t eeprom_wol;

};

drivers/net/e1000/e1000_ethtool.c

+9 −8
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ e1000_set_tso(struct net_device *netdev, uint32_t data) 
		netdev->features &= ~NETIF_F_TSO6;



	DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");

	adapter->tso_force = TRUE;

	adapter->tso_force = true;

	return 0;

}
@@ -922,7 +922,8 @@ static int 
e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)

{

	struct net_device *netdev = adapter->netdev;

	uint32_t mask, i=0, shared_int = TRUE;

	uint32_t mask, i = 0;

	bool shared_int = true;

	uint32_t irq = adapter->pdev->irq;



	*data = 0;
@@ -931,7 +932,7 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) 
	/* Hook up test interrupt handler just for this test */

	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,

	                 netdev))

		shared_int = FALSE;

		shared_int = false;

	else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,

	         netdev->name, netdev)) {

		*data = 1;
@@ -1295,7 +1296,7 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter) 
	uint32_t ctrl_reg = 0;

	uint32_t stat_reg = 0;



	adapter->hw.autoneg = FALSE;

	adapter->hw.autoneg = false;



	if (adapter->hw.phy_type == e1000_phy_m88) {

		/* Auto-MDI/MDIX Off */
@@ -1473,7 +1474,7 @@ e1000_loopback_cleanup(struct e1000_adapter *adapter) 
	case e1000_82545_rev_3:

	case e1000_82546_rev_3:

	default:

		hw->autoneg = TRUE;

		hw->autoneg = true;

		if (hw->phy_type == e1000_phy_gg82563)

			e1000_write_phy_reg(hw,

					    GG82563_PHY_KMRN_MODE_CTRL,
@@ -1607,13 +1608,13 @@ e1000_link_test(struct e1000_adapter *adapter, uint64_t *data) 
	*data = 0;

	if (adapter->hw.media_type == e1000_media_type_internal_serdes) {

		int i = 0;

		adapter->hw.serdes_link_down = TRUE;

		adapter->hw.serdes_link_down = true;



		/* On some blade server designs, link establishment

		 * could take as long as 2-3 minutes */

		do {

			e1000_check_for_link(&adapter->hw);

			if (adapter->hw.serdes_link_down == FALSE)

			if (!adapter->hw.serdes_link_down)

				return *data;

			msleep(20);

		} while (i++ < 3750);
@@ -1649,7 +1650,7 @@ e1000_diag_test(struct net_device *netdev, 
		   struct ethtool_test *eth_test, uint64_t *data)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	boolean_t if_running = netif_running(netdev);

	bool if_running = netif_running(netdev);



	set_bit(__E1000_TESTING, &adapter->flags);

	if (eth_test->flags == ETH_TEST_FL_OFFLINE) {

drivers/net/e1000/e1000_hw.c

+111 −112

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_hw.h

+31 −31
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ typedef enum { 


struct e1000_shadow_ram {

    uint16_t eeprom_word;

    boolean_t   modified;

    bool modified;

};



/* PCI bus types */
@@ -274,8 +274,8 @@ struct e1000_eeprom_info { 
    uint16_t address_bits;

    uint16_t delay_usec;

    uint16_t page_size;

    boolean_t use_eerd;

    boolean_t use_eewr;

    bool use_eerd;

    bool use_eewr;

};



/* Flex ASF Information */
@@ -391,8 +391,8 @@ struct e1000_host_mng_dhcp_cookie{ 


int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer,

                                  uint16_t length);

boolean_t e1000_check_mng_mode(struct e1000_hw *hw);

boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);

bool e1000_check_mng_mode(struct e1000_hw *hw);

bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);

int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data);

int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw);

int32_t e1000_update_eeprom_checksum(struct e1000_hw *hw);
@@ -1420,7 +1420,7 @@ struct e1000_hw { 
	uint32_t		ledctl_default;

	uint32_t		ledctl_mode1;

	uint32_t		ledctl_mode2;

	boolean_t		tx_pkt_filtering;

	bool			tx_pkt_filtering;

	struct e1000_host_mng_dhcp_cookie mng_cookie;

	uint16_t		phy_spd_default;

	uint16_t		autoneg_advertised;
@@ -1445,30 +1445,30 @@ struct e1000_hw { 
	uint8_t			dma_fairness;

	uint8_t			mac_addr[NODE_ADDRESS_SIZE];

	uint8_t			perm_mac_addr[NODE_ADDRESS_SIZE];

	boolean_t		disable_polarity_correction;

	boolean_t		speed_downgraded;

	bool			disable_polarity_correction;

	bool			speed_downgraded;

	e1000_smart_speed	smart_speed;

	e1000_dsp_config	dsp_config_state;

	boolean_t		get_link_status;

	boolean_t		serdes_link_down;

	boolean_t		tbi_compatibility_en;

	boolean_t		tbi_compatibility_on;

	boolean_t		laa_is_present;

	boolean_t		phy_reset_disable;

	boolean_t		initialize_hw_bits_disable;

	boolean_t		fc_send_xon;

	boolean_t		fc_strict_ieee;

	boolean_t		report_tx_early;

	boolean_t		adaptive_ifs;

	boolean_t		ifs_params_forced;

	boolean_t		in_ifs_mode;

	boolean_t		mng_reg_access_disabled;

	boolean_t		leave_av_bit_off;

	boolean_t		kmrn_lock_loss_workaround_disabled;

	boolean_t		bad_tx_carr_stats_fd;

	boolean_t		has_manc2h;

	boolean_t		rx_needs_kicking;

	boolean_t		has_smbus;

	bool			get_link_status;

	bool			serdes_link_down;

	bool			tbi_compatibility_en;

	bool			tbi_compatibility_on;

	bool			laa_is_present;

	bool			phy_reset_disable;

	bool			initialize_hw_bits_disable;

	bool			fc_send_xon;

	bool			fc_strict_ieee;

	bool			report_tx_early;

	bool			adaptive_ifs;

	bool			ifs_params_forced;

	bool			in_ifs_mode;

	bool			mng_reg_access_disabled;

	bool			leave_av_bit_off;

	bool			kmrn_lock_loss_workaround_disabled;

	bool			bad_tx_carr_stats_fd;

	bool			has_manc2h;

	bool			rx_needs_kicking;

	bool			has_smbus;

};
@@ -2518,11 +2518,11 @@ struct e1000_host_command_info { 
 * Typical use:

 *  ...

 *  if (TBI_ACCEPT) {

 *      accept_frame = TRUE;

 *      accept_frame = true;

 *      e1000_tbi_adjust_stats(adapter, MacAddress);

 *      frame_length--;

 *  } else {

 *      accept_frame = FALSE;

 *      accept_frame = false;

 *  }

 *  ...

 */

drivers/net/e1000/e1000_main.c

+45 −45
Original line number Diff line number Diff line
@@ -169,20 +169,20 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu); 
static int e1000_set_mac(struct net_device *netdev, void *p);

static irqreturn_t e1000_intr(int irq, void *data);

static irqreturn_t e1000_intr_msi(int irq, void *data);

static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,

static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,

			       struct e1000_tx_ring *tx_ring);

#ifdef CONFIG_E1000_NAPI

static int e1000_clean(struct napi_struct *napi, int budget);

static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,

static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,

			       struct e1000_rx_ring *rx_ring,

			       int *work_done, int work_to_do);

static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,

static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,

				  struct e1000_rx_ring *rx_ring,

				  int *work_done, int work_to_do);

#else

static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,

static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,

			       struct e1000_rx_ring *rx_ring);

static boolean_t e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,

static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,

				  struct e1000_rx_ring *rx_ring);

#endif

static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
@@ -584,7 +584,7 @@ void e1000_power_up_phy(struct e1000_adapter *adapter) 
static void e1000_power_down_phy(struct e1000_adapter *adapter)

{

	/* Power down the PHY so no link is implied when interface is down *

	 * The PHY cannot be powered down if any of the following is TRUE *

	 * The PHY cannot be powered down if any of the following is true *

	 * (a) WoL is enabled

	 * (b) AMT is active

	 * (c) SoL/IDER session is active */
@@ -673,7 +673,7 @@ e1000_reset(struct e1000_adapter *adapter) 
{

	uint32_t pba = 0, tx_space, min_tx_space, min_rx_space;

	uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;

	boolean_t legacy_pba_adjust = FALSE;

	bool legacy_pba_adjust = false;



	/* Repartition Pba for greater than 9k mtu

	 * To take effect CTRL.RST is required.
@@ -687,7 +687,7 @@ e1000_reset(struct e1000_adapter *adapter) 
	case e1000_82540:

	case e1000_82541:

	case e1000_82541_rev_2:

		legacy_pba_adjust = TRUE;

		legacy_pba_adjust = true;

		pba = E1000_PBA_48K;

		break;

	case e1000_82545:
@@ -698,7 +698,7 @@ e1000_reset(struct e1000_adapter *adapter) 
		break;

	case e1000_82547:

	case e1000_82547_rev_2:

		legacy_pba_adjust = TRUE;

		legacy_pba_adjust = true;

		pba = E1000_PBA_30K;

		break;

	case e1000_82571:
@@ -716,7 +716,7 @@ e1000_reset(struct e1000_adapter *adapter) 
		break;

	}



	if (legacy_pba_adjust == TRUE) {

	if (legacy_pba_adjust) {

		if (adapter->netdev->mtu > E1000_RXBUFFER_8192)

			pba -= 8; /* allocate more FIFO for Tx */
@@ -1366,15 +1366,15 @@ e1000_sw_init(struct e1000_adapter *adapter) 


	e1000_set_media_type(hw);



	hw->wait_autoneg_complete = FALSE;

	hw->tbi_compatibility_en = TRUE;

	hw->adaptive_ifs = TRUE;

	hw->wait_autoneg_complete = false;

	hw->tbi_compatibility_en = true;

	hw->adaptive_ifs = true;



	/* Copper options */



	if (hw->media_type == e1000_media_type_copper) {

		hw->mdix = AUTO_ALL_MODES;

		hw->disable_polarity_correction = FALSE;

		hw->disable_polarity_correction = false;

		hw->master_slave = E1000_MASTER_SLAVE;

	}
@@ -1576,7 +1576,7 @@ e1000_close(struct net_device *netdev) 
 * @start: address of beginning of memory

 * @len: length of memory

 **/

static boolean_t

static bool

e1000_check_64k_bound(struct e1000_adapter *adapter,

		      void *start, unsigned long len)

{
@@ -1587,10 +1587,10 @@ e1000_check_64k_bound(struct e1000_adapter *adapter, 
	 * write location to cross 64k boundary due to errata 23 */

	if (adapter->hw.mac_type == e1000_82545 ||

	    adapter->hw.mac_type == e1000_82546) {

		return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE;

		return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;

	}



	return TRUE;

	return true;

}



/**
@@ -2133,7 +2133,7 @@ e1000_configure_rx(struct e1000_adapter *adapter) 
	/* Enable 82543 Receive Checksum Offload for TCP and UDP */

	if (hw->mac_type >= e1000_82543) {

		rxcsum = E1000_READ_REG(hw, RXCSUM);

		if (adapter->rx_csum == TRUE) {

		if (adapter->rx_csum) {

			rxcsum |= E1000_RXCSUM_TUOFL;



			/* Enable 82571 IPv4 payload checksum for UDP fragments
@@ -2669,7 +2669,7 @@ e1000_watchdog(unsigned long data) 
	if (link) {

		if (!netif_carrier_ok(netdev)) {

			uint32_t ctrl;

			boolean_t txb2b = 1;

			bool txb2b = true;

			e1000_get_speed_and_duplex(&adapter->hw,

			                           &adapter->link_speed,

			                           &adapter->link_duplex);
@@ -2691,12 +2691,12 @@ e1000_watchdog(unsigned long data) 
			adapter->tx_timeout_factor = 1;

			switch (adapter->link_speed) {

			case SPEED_10:

				txb2b = 0;

				txb2b = false;

				netdev->tx_queue_len = 10;

				adapter->tx_timeout_factor = 8;

				break;

			case SPEED_100:

				txb2b = 0;

				txb2b = false;

				netdev->tx_queue_len = 100;

				/* maybe add some timeout factor ? */

				break;
@@ -2704,7 +2704,7 @@ e1000_watchdog(unsigned long data) 


			if ((adapter->hw.mac_type == e1000_82571 ||

			     adapter->hw.mac_type == e1000_82572) &&

			    txb2b == 0) {

			    !txb2b) {

				uint32_t tarc0;

				tarc0 = E1000_READ_REG(&adapter->hw, TARC0);

				tarc0 &= ~(1 << 21);
@@ -2802,7 +2802,7 @@ e1000_watchdog(unsigned long data) 
	E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0);



	/* Force detection of hung controller every watchdog period */

	adapter->detect_tx_hung = TRUE;

	adapter->detect_tx_hung = true;



	/* With 82571 controllers, LAA may be overwritten due to controller

	 * reset from the other port. Set the appropriate LAA in RAR[0] */
@@ -3025,12 +3025,12 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
		if (++i == tx_ring->count) i = 0;

		tx_ring->next_to_use = i;



		return TRUE;

		return true;

	}

	return FALSE;

	return false;

}



static boolean_t

static bool

e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,

              struct sk_buff *skb)

{
@@ -3060,10 +3060,10 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
		if (unlikely(++i == tx_ring->count)) i = 0;

		tx_ring->next_to_use = i;



		return TRUE;

		return true;

	}



	return FALSE;

	return false;

}



#define E1000_MAX_TXD_PWR	12
@@ -4038,7 +4038,7 @@ e1000_clean(struct napi_struct *napi, int budget) 
 * @adapter: board private structure

 **/



static boolean_t

static bool

e1000_clean_tx_irq(struct e1000_adapter *adapter,

                   struct e1000_tx_ring *tx_ring)

{
@@ -4049,7 +4049,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter, 
#ifdef CONFIG_E1000_NAPI

	unsigned int count = 0;

#endif

	boolean_t cleaned = FALSE;

	bool cleaned = false;

	unsigned int total_tx_bytes=0, total_tx_packets=0;



	i = tx_ring->next_to_clean;
@@ -4057,7 +4057,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter, 
	eop_desc = E1000_TX_DESC(*tx_ring, eop);



	while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {

		for (cleaned = FALSE; !cleaned; ) {

		for (cleaned = false; !cleaned; ) {

			tx_desc = E1000_TX_DESC(*tx_ring, i);

			buffer_info = &tx_ring->buffer_info[i];

			cleaned = (i == eop);
@@ -4105,7 +4105,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter, 
	if (adapter->detect_tx_hung) {

		/* Detect a transmit hang in hardware, this serializes the

		 * check with the clearing of time_stamp and movement of i */

		adapter->detect_tx_hung = FALSE;

		adapter->detect_tx_hung = false;

		if (tx_ring->buffer_info[eop].dma &&

		    time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +

		               (adapter->tx_timeout_factor * HZ))
@@ -4200,7 +4200,7 @@ e1000_rx_checksum(struct e1000_adapter *adapter, 
 * @adapter: board private structure

 **/



static boolean_t

static bool

#ifdef CONFIG_E1000_NAPI

e1000_clean_rx_irq(struct e1000_adapter *adapter,

                   struct e1000_rx_ring *rx_ring,
@@ -4219,7 +4219,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, 
	uint8_t last_byte;

	unsigned int i;

	int cleaned_count = 0;

	boolean_t cleaned = FALSE;

	bool cleaned = false;

	unsigned int total_rx_bytes=0, total_rx_packets=0;



	i = rx_ring->next_to_clean;
@@ -4247,7 +4247,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, 


		next_buffer = &rx_ring->buffer_info[i];



		cleaned = TRUE;

		cleaned = true;

		cleaned_count++;

		pci_unmap_single(pdev,

		                 buffer_info->dma,
@@ -4373,7 +4373,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, 
 * @adapter: board private structure

 **/



static boolean_t

static bool

#ifdef CONFIG_E1000_NAPI

e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,

                      struct e1000_rx_ring *rx_ring,
@@ -4393,7 +4393,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 
	unsigned int i, j;

	uint32_t length, staterr;

	int cleaned_count = 0;

	boolean_t cleaned = FALSE;

	bool cleaned = false;

	unsigned int total_rx_bytes=0, total_rx_packets=0;



	i = rx_ring->next_to_clean;
@@ -4420,7 +4420,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 


		next_buffer = &rx_ring->buffer_info[i];



		cleaned = TRUE;

		cleaned = true;

		cleaned_count++;

		pci_unmap_single(pdev, buffer_info->dma,

				 buffer_info->length,