diff options
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 481876b5424c..53614ed694fc 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -2563,7 +2563,7 @@ static int nv_tx_done(struct net_device *dev, int limit) | |||
2563 | 2563 | ||
2564 | if (np->desc_ver == DESC_VER_1) { | 2564 | if (np->desc_ver == DESC_VER_1) { |
2565 | if (flags & NV_TX_LASTPACKET) { | 2565 | if (flags & NV_TX_LASTPACKET) { |
2566 | if (flags & NV_TX_ERROR) { | 2566 | if (unlikely(flags & NV_TX_ERROR)) { |
2567 | if ((flags & NV_TX_RETRYERROR) | 2567 | if ((flags & NV_TX_RETRYERROR) |
2568 | && !(flags & NV_TX_RETRYCOUNT_MASK)) | 2568 | && !(flags & NV_TX_RETRYCOUNT_MASK)) |
2569 | nv_legacybackoff_reseed(dev); | 2569 | nv_legacybackoff_reseed(dev); |
@@ -2580,7 +2580,7 @@ static int nv_tx_done(struct net_device *dev, int limit) | |||
2580 | } | 2580 | } |
2581 | } else { | 2581 | } else { |
2582 | if (flags & NV_TX2_LASTPACKET) { | 2582 | if (flags & NV_TX2_LASTPACKET) { |
2583 | if (flags & NV_TX2_ERROR) { | 2583 | if (unlikely(flags & NV_TX2_ERROR)) { |
2584 | if ((flags & NV_TX2_RETRYERROR) | 2584 | if ((flags & NV_TX2_RETRYERROR) |
2585 | && !(flags & NV_TX2_RETRYCOUNT_MASK)) | 2585 | && !(flags & NV_TX2_RETRYCOUNT_MASK)) |
2586 | nv_legacybackoff_reseed(dev); | 2586 | nv_legacybackoff_reseed(dev); |
@@ -2626,7 +2626,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit) | |||
2626 | nv_unmap_txskb(np, np->get_tx_ctx); | 2626 | nv_unmap_txskb(np, np->get_tx_ctx); |
2627 | 2627 | ||
2628 | if (flags & NV_TX2_LASTPACKET) { | 2628 | if (flags & NV_TX2_LASTPACKET) { |
2629 | if (flags & NV_TX2_ERROR) { | 2629 | if (unlikely(flags & NV_TX2_ERROR)) { |
2630 | if ((flags & NV_TX2_RETRYERROR) | 2630 | if ((flags & NV_TX2_RETRYERROR) |
2631 | && !(flags & NV_TX2_RETRYCOUNT_MASK)) { | 2631 | && !(flags & NV_TX2_RETRYCOUNT_MASK)) { |
2632 | if (np->driver_data & DEV_HAS_GEAR_MODE) | 2632 | if (np->driver_data & DEV_HAS_GEAR_MODE) |