Commit 581330ba authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher

ixgbe: Whitespace cleanups

This patch contains several fixes for formatting in regards to whitespace.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6ca43507
...@@ -6233,7 +6233,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter) ...@@ -6233,7 +6233,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
* print link down message * print link down message
* @adapter - pointer to the adapter structure * @adapter - pointer to the adapter structure
**/ **/
static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter* adapter) static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter)
{ {
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct ixgbe_hw *hw = &adapter->hw; struct ixgbe_hw *hw = &adapter->hw;
...@@ -7332,8 +7332,8 @@ static void ixgbe_netpoll(struct net_device *netdev) ...@@ -7332,8 +7332,8 @@ static void ixgbe_netpoll(struct net_device *netdev)
} }
adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL; adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL;
} }
#endif
#endif
static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev, static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
...@@ -7418,7 +7418,6 @@ static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc) ...@@ -7418,7 +7418,6 @@ static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc)
return; return;
} }
/* ixgbe_setup_tc - routine to configure net_device for multiple traffic /* ixgbe_setup_tc - routine to configure net_device for multiple traffic
* classes. * classes.
* *
...@@ -7438,7 +7437,8 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) ...@@ -7438,7 +7437,8 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
/* Hardware supports up to 8 traffic classes */ /* Hardware supports up to 8 traffic classes */
if (tc > adapter->dcb_cfg.num_tcs.pg_tcs || if (tc > adapter->dcb_cfg.num_tcs.pg_tcs ||
(hw->mac.type == ixgbe_mac_82598EB && tc < MAX_TRAFFIC_CLASS)) (hw->mac.type == ixgbe_mac_82598EB &&
tc < MAX_TRAFFIC_CLASS))
return -EINVAL; return -EINVAL;
/* Hardware has to reinitialize queues and interrupts to /* Hardware has to reinitialize queues and interrupts to
...@@ -7452,7 +7452,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) ...@@ -7452,7 +7452,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
if (tc) { if (tc) {
netdev_set_num_tc(dev, tc); netdev_set_num_tc(dev, tc);
adapter->last_lfc_mode = adapter->hw.fc.current_mode; adapter->last_lfc_mode = adapter->hw.fc.current_mode;
adapter->flags |= IXGBE_FLAG_DCB_ENABLED; adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE; adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
...@@ -7460,7 +7459,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) ...@@ -7460,7 +7459,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
adapter->hw.fc.requested_mode = ixgbe_fc_none; adapter->hw.fc.requested_mode = ixgbe_fc_none;
} else { } else {
netdev_reset_tc(dev); netdev_reset_tc(dev);
adapter->hw.fc.requested_mode = adapter->last_lfc_mode; adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED; adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
...@@ -7576,7 +7574,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { ...@@ -7576,7 +7574,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_stop = ixgbe_close, .ndo_stop = ixgbe_close,
.ndo_start_xmit = ixgbe_xmit_frame, .ndo_start_xmit = ixgbe_xmit_frame,
.ndo_select_queue = ixgbe_select_queue, .ndo_select_queue = ixgbe_select_queue,
.ndo_set_rx_mode = ixgbe_set_rx_mode, .ndo_set_rx_mode = ixgbe_set_rx_mode,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = ixgbe_set_mac, .ndo_set_mac_address = ixgbe_set_mac,
.ndo_change_mtu = ixgbe_change_mtu, .ndo_change_mtu = ixgbe_change_mtu,
...@@ -7587,7 +7585,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { ...@@ -7587,7 +7585,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_set_vf_mac = ixgbe_ndo_set_vf_mac, .ndo_set_vf_mac = ixgbe_ndo_set_vf_mac,
.ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan,
.ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw, .ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw,
.ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk,
.ndo_get_vf_config = ixgbe_ndo_get_vf_config, .ndo_get_vf_config = ixgbe_ndo_get_vf_config,
.ndo_get_stats64 = ixgbe_get_stats64, .ndo_get_stats64 = ixgbe_get_stats64,
.ndo_setup_tc = ixgbe_setup_tc, .ndo_setup_tc = ixgbe_setup_tc,
...@@ -7902,7 +7900,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -7902,7 +7900,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
} }
setup_timer(&adapter->service_timer, &ixgbe_service_timer, setup_timer(&adapter->service_timer, &ixgbe_service_timer,
(unsigned long) adapter); (unsigned long) adapter);
INIT_WORK(&adapter->service_task, ixgbe_service_task); INIT_WORK(&adapter->service_task, ixgbe_service_task);
clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state); clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
...@@ -7990,7 +7988,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -7990,7 +7988,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
/* reset the hardware with the new settings */ /* reset the hardware with the new settings */
err = hw->mac.ops.start_hw(hw); err = hw->mac.ops.start_hw(hw);
if (err == IXGBE_ERR_EEPROM_VERSION) { if (err == IXGBE_ERR_EEPROM_VERSION) {
/* We are running on a pre-production device, log a warning */ /* We are running on a pre-production device, log a warning */
e_dev_warn("This device is a pre-production adapter/LOM. " e_dev_warn("This device is a pre-production adapter/LOM. "
......
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