evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ixgbe: dcbnl reduce duplicated code and indentation

Browse source 
Replace duplicated code in if/else branches with single
check and ixgbe_init_interrupt_scheme().

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
John Fastabend 2011-04-26 10:05:14 +00:00 • committed by Jeff Kirsher
parent c12db7695e
commit 1fcd86b511
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/net/ixgbe/ixgbe_dcb_nl.c
View file

@ -146,37 +146,34 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
adapter->flags |= IXGBE_FLAG_DCB_ENABLED; adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
if (!netdev_get_num_tc(netdev)) if (!netdev_get_num_tc(netdev))
ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS); ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
ixgbe_init_interrupt_scheme(adapter);
if (netif_running(netdev))
netdev->netdev_ops->ndo_open(netdev);
} else { } else {
/* Turn off DCB */ /* Turn off DCB */
if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
if (netif_running(netdev)) goto out;
netdev->netdev_ops->ndo_stop(netdev);
ixgbe_clear_interrupt_scheme(adapter);
adapter->hw.fc.requested_mode = adapter->last_lfc_mode; if (netif_running(netdev))
adapter->temp_dcb_cfg.pfc_mode_enable = false; netdev->netdev_ops->ndo_stop(netdev);
adapter->dcb_cfg.pfc_mode_enable = false; ixgbe_clear_interrupt_scheme(adapter);
adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
switch (adapter->hw.mac.type) {
case ixgbe_mac_82599EB:
case ixgbe_mac_X540:
adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
break;
default:
break;
}
ixgbe_setup_tc(netdev, 0); adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
adapter->temp_dcb_cfg.pfc_mode_enable = false;
ixgbe_init_interrupt_scheme(adapter); adapter->dcb_cfg.pfc_mode_enable = false;
if (netif_running(netdev)) adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
netdev->netdev_ops->ndo_open(netdev); switch (adapter->hw.mac.type) {
case ixgbe_mac_82599EB:
case ixgbe_mac_X540:
adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
break;
default:
break;
} }
ixgbe_setup_tc(netdev, 0);
} }
ixgbe_init_interrupt_scheme(adapter);
if (netif_running(netdev))
netdev->netdev_ops->ndo_open(netdev);
out: out:
return err; return err;
} }