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

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
...@@ -346,8 +346,7 @@ ixgb_reset(struct ixgb_adapter *adapter) ...@@ -346,8 +346,7 @@ ixgb_reset(struct ixgb_adapter *adapter)
**/ **/
static int __devinit static int __devinit
ixgb_probe(struct pci_dev *pdev, ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct net_device *netdev = NULL; struct net_device *netdev = NULL;
struct ixgb_adapter *adapter; struct ixgb_adapter *adapter;
...@@ -729,8 +728,8 @@ ixgb_configure_tx(struct ixgb_adapter *adapter) ...@@ -729,8 +728,8 @@ ixgb_configure_tx(struct ixgb_adapter *adapter)
/* Setup Transmit Descriptor Settings for this adapter */ /* Setup Transmit Descriptor Settings for this adapter */
adapter->tx_cmd_type = adapter->tx_cmd_type =
IXGB_TX_DESC_TYPE IXGB_TX_DESC_TYPE |
| (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0); (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);
} }
/** /**
...@@ -1076,7 +1075,8 @@ ixgb_set_multi(struct net_device *netdev) ...@@ -1076,7 +1075,8 @@ ixgb_set_multi(struct net_device *netdev)
IXGB_WRITE_REG(hw, RCTL, rctl); 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) i++, mc_ptr = mc_ptr->next)
memcpy(&mta[i * IXGB_ETH_LENGTH_OF_ADDRESS], memcpy(&mta[i * IXGB_ETH_LENGTH_OF_ADDRESS],
mc_ptr->dmi_addr, 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) ...@@ -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; if (++i == tx_ring->count) i = 0;
} }
tx_desc->cmd_type_len |= cpu_to_le32(IXGB_TX_DESC_CMD_EOP tx_desc->cmd_type_len |=
| IXGB_TX_DESC_CMD_RS ); cpu_to_le32(IXGB_TX_DESC_CMD_EOP | IXGB_TX_DESC_CMD_RS);
/* Force memory writes to complete before letting h/w /* Force memory writes to complete before letting h/w
* know there are new descriptors to fetch. (Only * know there are new descriptors to fetch. (Only
...@@ -1787,8 +1787,8 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) ...@@ -1787,8 +1787,8 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
tx_desc = IXGB_TX_DESC(*tx_ring, i); tx_desc = IXGB_TX_DESC(*tx_ring, i);
buffer_info = &tx_ring->buffer_info[i]; buffer_info = &tx_ring->buffer_info[i];
if (tx_desc->popts if (tx_desc->popts &
& (IXGB_TX_DESC_POPTS_TXSM | (IXGB_TX_DESC_POPTS_TXSM |
IXGB_TX_DESC_POPTS_IXSM)) IXGB_TX_DESC_POPTS_IXSM))
adapter->hw_csum_tx_good++; adapter->hw_csum_tx_good++;
...@@ -1960,11 +1960,9 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter) ...@@ -1960,11 +1960,9 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
goto rxdesc_done; goto rxdesc_done;
} }
if (unlikely(rx_desc->errors if (unlikely(rx_desc->errors &
& (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE |
| IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_RXE))) {
IXGB_RX_DESC_ERRORS_RXE))) {
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
goto rxdesc_done; goto rxdesc_done;
} }
...@@ -2231,7 +2229,7 @@ static void ixgb_netpoll(struct net_device *dev) ...@@ -2231,7 +2229,7 @@ static void ixgb_netpoll(struct net_device *dev)
* This callback is called by the PCI subsystem whenever * This callback is called by the PCI subsystem whenever
* a PCI bus error is detected. * a PCI bus error is detected.
*/ */
static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev,
enum pci_channel_state state) enum pci_channel_state state)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
...@@ -2255,7 +2253,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, ...@@ -2255,7 +2253,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
* This is a shortened version of the device probe/discovery code, * This is a shortened version of the device probe/discovery code,
* it resembles the first-half of the ixgb_probe() routine. * it resembles the first-half of the ixgb_probe() routine.
*/ */
static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev) static pci_ers_result_t ixgb_io_slot_reset(struct pci_dev *pdev)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
struct ixgb_adapter *adapter = netdev_priv(netdev); struct ixgb_adapter *adapter = netdev_priv(netdev);
...@@ -2299,7 +2297,7 @@ static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev) ...@@ -2299,7 +2297,7 @@ static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev)
* normal operation. Implementation resembles the second-half * normal operation. Implementation resembles the second-half
* of the ixgb_probe() routine. * of the ixgb_probe() routine.
*/ */
static void ixgb_io_resume (struct pci_dev *pdev) static void ixgb_io_resume(struct pci_dev *pdev)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
struct ixgb_adapter *adapter = netdev_priv(netdev); struct ixgb_adapter *adapter = netdev_priv(netdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment