diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2012-02-08 02:51:47 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-19 05:02:21 -0400 |
commit | 581330ba7b219fec0587452bd72fe5635c30c4ae (patch) | |
tree | e0a516ba9a16b7a7356aadfc0493bc447d63e8e9 /drivers | |
parent | 6ca435078822d9728318dee49ba4f2ff8a2ead24 (diff) |
ixgbe: Whitespace cleanups
This patch contains several fixes for formatting in regards to whitespace.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index eb58f13773ad..1d22c9f0e9fe 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -6233,7 +6233,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter) | |||
6233 | * print link down message | 6233 | * print link down message |
6234 | * @adapter - pointer to the adapter structure | 6234 | * @adapter - pointer to the adapter structure |
6235 | **/ | 6235 | **/ |
6236 | static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter* adapter) | 6236 | static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter) |
6237 | { | 6237 | { |
6238 | struct net_device *netdev = adapter->netdev; | 6238 | struct net_device *netdev = adapter->netdev; |
6239 | struct ixgbe_hw *hw = &adapter->hw; | 6239 | struct ixgbe_hw *hw = &adapter->hw; |
@@ -7332,8 +7332,8 @@ static void ixgbe_netpoll(struct net_device *netdev) | |||
7332 | } | 7332 | } |
7333 | adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL; | 7333 | adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL; |
7334 | } | 7334 | } |
7335 | #endif | ||
7336 | 7335 | ||
7336 | #endif | ||
7337 | static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev, | 7337 | static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev, |
7338 | struct rtnl_link_stats64 *stats) | 7338 | struct rtnl_link_stats64 *stats) |
7339 | { | 7339 | { |
@@ -7418,7 +7418,6 @@ static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc) | |||
7418 | return; | 7418 | return; |
7419 | } | 7419 | } |
7420 | 7420 | ||
7421 | |||
7422 | /* ixgbe_setup_tc - routine to configure net_device for multiple traffic | 7421 | /* ixgbe_setup_tc - routine to configure net_device for multiple traffic |
7423 | * classes. | 7422 | * classes. |
7424 | * | 7423 | * |
@@ -7438,7 +7437,8 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) | |||
7438 | 7437 | ||
7439 | /* Hardware supports up to 8 traffic classes */ | 7438 | /* Hardware supports up to 8 traffic classes */ |
7440 | if (tc > adapter->dcb_cfg.num_tcs.pg_tcs || | 7439 | if (tc > adapter->dcb_cfg.num_tcs.pg_tcs || |
7441 | (hw->mac.type == ixgbe_mac_82598EB && tc < MAX_TRAFFIC_CLASS)) | 7440 | (hw->mac.type == ixgbe_mac_82598EB && |
7441 | tc < MAX_TRAFFIC_CLASS)) | ||
7442 | return -EINVAL; | 7442 | return -EINVAL; |
7443 | 7443 | ||
7444 | /* Hardware has to reinitialize queues and interrupts to | 7444 | /* Hardware has to reinitialize queues and interrupts to |
@@ -7452,7 +7452,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) | |||
7452 | if (tc) { | 7452 | if (tc) { |
7453 | netdev_set_num_tc(dev, tc); | 7453 | netdev_set_num_tc(dev, tc); |
7454 | adapter->last_lfc_mode = adapter->hw.fc.current_mode; | 7454 | adapter->last_lfc_mode = adapter->hw.fc.current_mode; |
7455 | |||
7456 | adapter->flags |= IXGBE_FLAG_DCB_ENABLED; | 7455 | adapter->flags |= IXGBE_FLAG_DCB_ENABLED; |
7457 | adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE; | 7456 | adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE; |
7458 | 7457 | ||
@@ -7460,7 +7459,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) | |||
7460 | adapter->hw.fc.requested_mode = ixgbe_fc_none; | 7459 | adapter->hw.fc.requested_mode = ixgbe_fc_none; |
7461 | } else { | 7460 | } else { |
7462 | netdev_reset_tc(dev); | 7461 | netdev_reset_tc(dev); |
7463 | |||
7464 | adapter->hw.fc.requested_mode = adapter->last_lfc_mode; | 7462 | adapter->hw.fc.requested_mode = adapter->last_lfc_mode; |
7465 | 7463 | ||
7466 | adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED; | 7464 | adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED; |
@@ -7576,7 +7574,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { | |||
7576 | .ndo_stop = ixgbe_close, | 7574 | .ndo_stop = ixgbe_close, |
7577 | .ndo_start_xmit = ixgbe_xmit_frame, | 7575 | .ndo_start_xmit = ixgbe_xmit_frame, |
7578 | .ndo_select_queue = ixgbe_select_queue, | 7576 | .ndo_select_queue = ixgbe_select_queue, |
7579 | .ndo_set_rx_mode = ixgbe_set_rx_mode, | 7577 | .ndo_set_rx_mode = ixgbe_set_rx_mode, |
7580 | .ndo_validate_addr = eth_validate_addr, | 7578 | .ndo_validate_addr = eth_validate_addr, |
7581 | .ndo_set_mac_address = ixgbe_set_mac, | 7579 | .ndo_set_mac_address = ixgbe_set_mac, |
7582 | .ndo_change_mtu = ixgbe_change_mtu, | 7580 | .ndo_change_mtu = ixgbe_change_mtu, |
@@ -7587,7 +7585,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { | |||
7587 | .ndo_set_vf_mac = ixgbe_ndo_set_vf_mac, | 7585 | .ndo_set_vf_mac = ixgbe_ndo_set_vf_mac, |
7588 | .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, | 7586 | .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, |
7589 | .ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw, | 7587 | .ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw, |
7590 | .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, | 7588 | .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, |
7591 | .ndo_get_vf_config = ixgbe_ndo_get_vf_config, | 7589 | .ndo_get_vf_config = ixgbe_ndo_get_vf_config, |
7592 | .ndo_get_stats64 = ixgbe_get_stats64, | 7590 | .ndo_get_stats64 = ixgbe_get_stats64, |
7593 | .ndo_setup_tc = ixgbe_setup_tc, | 7591 | .ndo_setup_tc = ixgbe_setup_tc, |
@@ -7902,7 +7900,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
7902 | } | 7900 | } |
7903 | 7901 | ||
7904 | setup_timer(&adapter->service_timer, &ixgbe_service_timer, | 7902 | setup_timer(&adapter->service_timer, &ixgbe_service_timer, |
7905 | (unsigned long) adapter); | 7903 | (unsigned long) adapter); |
7906 | 7904 | ||
7907 | INIT_WORK(&adapter->service_task, ixgbe_service_task); | 7905 | INIT_WORK(&adapter->service_task, ixgbe_service_task); |
7908 | clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state); | 7906 | clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state); |
@@ -7990,7 +7988,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
7990 | 7988 | ||
7991 | /* reset the hardware with the new settings */ | 7989 | /* reset the hardware with the new settings */ |
7992 | err = hw->mac.ops.start_hw(hw); | 7990 | err = hw->mac.ops.start_hw(hw); |
7993 | |||
7994 | if (err == IXGBE_ERR_EEPROM_VERSION) { | 7991 | if (err == IXGBE_ERR_EEPROM_VERSION) { |
7995 | /* We are running on a pre-production device, log a warning */ | 7992 | /* We are running on a pre-production device, log a warning */ |
7996 | e_dev_warn("This device is a pre-production adapter/LOM. " | 7993 | e_dev_warn("This device is a pre-production adapter/LOM. " |