Commit 0060c072 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files

ixgb: whitespace fixups 



Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9a432992

drivers/net/ixgb/ixgb_main.c

+38 −40
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ ixgb_reset(struct ixgb_adapter *adapter) 
 **/



static int __devinit

ixgb_probe(struct pci_dev *pdev,

		const struct pci_device_id *ent)

ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct net_device *netdev = NULL;

	struct ixgb_adapter *adapter;
@@ -729,8 +728,8 @@ ixgb_configure_tx(struct ixgb_adapter *adapter) 


	/* Setup Transmit Descriptor Settings for this adapter */

	adapter->tx_cmd_type =

		IXGB_TX_DESC_TYPE 

		| (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);

		IXGB_TX_DESC_TYPE |

		(adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);

}



/**
@@ -1076,7 +1075,8 @@ ixgb_set_multi(struct net_device *netdev) 


		IXGB_WRITE_REG(hw, RCTL, rctl);



		for(i = 0, mc_ptr = netdev->mc_list; mc_ptr;

		for (i = 0, mc_ptr = netdev->mc_list;

		     mc_ptr;

		     i++, mc_ptr = mc_ptr->next)

			memcpy(&mta[i * IXGB_ETH_LENGTH_OF_ADDRESS],

			       mc_ptr->dmi_addr, IXGB_ETH_LENGTH_OF_ADDRESS);
@@ -1375,8 +1375,8 @@ ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags) 
		if (++i == tx_ring->count) i = 0;

	}



	tx_desc->cmd_type_len |= cpu_to_le32(IXGB_TX_DESC_CMD_EOP 

				| IXGB_TX_DESC_CMD_RS );

	tx_desc->cmd_type_len |=

		cpu_to_le32(IXGB_TX_DESC_CMD_EOP | IXGB_TX_DESC_CMD_RS);



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.  (Only
@@ -1787,8 +1787,8 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) 
			tx_desc = IXGB_TX_DESC(*tx_ring, i);

			buffer_info = &tx_ring->buffer_info[i];



			if (tx_desc->popts

			    & (IXGB_TX_DESC_POPTS_TXSM |

			if (tx_desc->popts &

			   (IXGB_TX_DESC_POPTS_TXSM |

			    IXGB_TX_DESC_POPTS_IXSM))

				adapter->hw_csum_tx_good++;
@@ -1960,11 +1960,9 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter) 
			goto rxdesc_done;

		}



		if (unlikely(rx_desc->errors

			     & (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE

				| IXGB_RX_DESC_ERRORS_P |

				IXGB_RX_DESC_ERRORS_RXE))) {



		if (unlikely(rx_desc->errors &

		    (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE |

		     IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_RXE))) {

			dev_kfree_skb_irq(skb);

			goto rxdesc_done;

		}

drivers/net/ixgb/ixgb_ids.h

+4 −4

File changed.

Contains only whitespace changes.

drivers/net/ixgb/ixgb_param.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/net/ixgb/ixgb.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/ixgb/ixgb_ethtool.c

+18 −18

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE