openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

igbvf: cleanup msleep() and min/max() usage 

Fixed a few cases of when we used msleep() when we should have been
using usleep_range().  Also updated the usage of min/max() to use
min_t/max_t().

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
This commit is contained in:
Jeff Kirsher 2015-02-20 20:55:56 -08:00
parent 0340501b1c
commit 5beef769ec
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/intel/igbvf/ethtool.c
View File

@ -224,12 +224,12 @@ static int igbvf_set_ringparam(struct net_device *netdev,
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
return -EINVAL; return -EINVAL;
new_rx_count = max(ring->rx_pending, (u32)IGBVF_MIN_RXD); new_rx_count = max_t(u32, ring->rx_pending, IGBVF_MIN_RXD);
new_rx_count = min(new_rx_count, (u32)IGBVF_MAX_RXD); new_rx_count = min_t(u32, new_rx_count, IGBVF_MAX_RXD);
new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE); new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
new_tx_count = max(ring->tx_pending, (u32)IGBVF_MIN_TXD); new_tx_count = max_t(u32, ring->tx_pending, IGBVF_MIN_TXD);
new_tx_count = min(new_tx_count, (u32)IGBVF_MAX_TXD); new_tx_count = min_t(u32, new_tx_count, IGBVF_MAX_TXD);
new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE); new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
if ((new_tx_count == adapter->tx_ring->count) && if ((new_tx_count == adapter->tx_ring->count) &&
@ -239,7 +239,7 @@ static int igbvf_set_ringparam(struct net_device *netdev,
} }
while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state)) while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
msleep(1); usleep_range(1000, 2000);
if (!netif_running(adapter->netdev)) { if (!netif_running(adapter->netdev)) {
adapter->tx_ring->count = new_tx_count; adapter->tx_ring->count = new_tx_count;

2
drivers/net/ethernet/intel/igbvf/netdev.c
View File

@ -1552,7 +1552,7 @@ void igbvf_reinit_locked(struct igbvf_adapter *adapter)
{ {
might_sleep(); might_sleep();
while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state)) while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
msleep(1); usleep_range(1000, 2000);
igbvf_down(adapter); igbvf_down(adapter);
igbvf_up(adapter); igbvf_up(adapter);
clear_bit(__IGBVF_RESETTING, &adapter->state); clear_bit(__IGBVF_RESETTING, &adapter->state);