diff options
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 2fbac31767fa..80b404f2b938 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -1784,9 +1784,9 @@ static void bdx_tx_cleanup(struct bdx_priv *priv) | |||
1784 | } | 1784 | } |
1785 | #endif | 1785 | #endif |
1786 | 1786 | ||
1787 | if (unlikely(netif_queue_stopped(priv->ndev) | 1787 | if (unlikely(netif_queue_stopped(priv->ndev) && |
1788 | && netif_carrier_ok(priv->ndev) | 1788 | netif_carrier_ok(priv->ndev) && |
1789 | && (priv->tx_level >= BDX_MIN_TX_LEVEL))) { | 1789 | (priv->tx_level >= BDX_MIN_TX_LEVEL))) { |
1790 | DBG("%s: %s: TX Q WAKE level %d\n", | 1790 | DBG("%s: %s: TX Q WAKE level %d\n", |
1791 | BDX_DRV_NAME, priv->ndev->name, priv->tx_level); | 1791 | BDX_DRV_NAME, priv->ndev->name, priv->tx_level); |
1792 | netif_wake_queue(priv->ndev); | 1792 | netif_wake_queue(priv->ndev); |
@@ -2273,8 +2273,8 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal) | |||
2273 | (((tx_max_coal * BDX_TXF_DESC_SZ) + PCK_TH_MULT - 1) | 2273 | (((tx_max_coal * BDX_TXF_DESC_SZ) + PCK_TH_MULT - 1) |
2274 | / PCK_TH_MULT); | 2274 | / PCK_TH_MULT); |
2275 | 2275 | ||
2276 | if ((rx_coal > 0x7FFF) || (tx_coal > 0x7FFF) | 2276 | if ((rx_coal > 0x7FFF) || (tx_coal > 0x7FFF) || |
2277 | || (rx_max_coal > 0xF) || (tx_max_coal > 0xF)) | 2277 | (rx_max_coal > 0xF) || (tx_max_coal > 0xF)) |
2278 | return -EINVAL; | 2278 | return -EINVAL; |
2279 | 2279 | ||
2280 | rdintcm = INT_REG_VAL(rx_coal, GET_INT_COAL_RC(priv->rdintcm), | 2280 | rdintcm = INT_REG_VAL(rx_coal, GET_INT_COAL_RC(priv->rdintcm), |
@@ -2347,8 +2347,8 @@ bdx_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) | |||
2347 | tx_size = 3; | 2347 | tx_size = 3; |
2348 | 2348 | ||
2349 | /*Is there anything to do? */ | 2349 | /*Is there anything to do? */ |
2350 | if ((rx_size == priv->rxf_size) | 2350 | if ((rx_size == priv->rxf_size) && |
2351 | && (tx_size == priv->txd_size)) | 2351 | (tx_size == priv->txd_size)) |
2352 | return 0; | 2352 | return 0; |
2353 | 2353 | ||
2354 | priv->rxf_size = rx_size; | 2354 | priv->rxf_size = rx_size; |