diff options
| author | Peng Li <lipeng321@huawei.com> | 2018-06-28 12:12:23 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-29 11:06:34 +0900 |
| commit | 0e6084aa1c4eba8913143ea30254d50ed01724eb (patch) | |
| tree | 84d6cb7fb276dc9c873a244e2b2bf8d689bc74a8 | |
| parent | 94c5e532130207f6ecfe0e1afd4ed3495ec1706f (diff) | |
| download | linux-stable-0e6084aa1c4eba8913143ea30254d50ed01724eb.tar.gz linux-stable-0e6084aa1c4eba8913143ea30254d50ed01724eb.tar.bz2 linux-stable-0e6084aa1c4eba8913143ea30254d50ed01724eb.zip | |
net: hns3: add unlikely for error check
The first bd of a packet is invalid and invalid ring head for tx
IRQ is not offen, they may occur when there is error,
Add unlikely for error check branch is better for performance.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 99bb6a82626a..1a68952339c2 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1917,7 +1917,7 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget) if (is_ring_empty(ring) || head == ring->next_to_clean) return true; /* no data to poll */ - if (!is_valid_clean_head(ring, head)) { + if (unlikely(!is_valid_clean_head(ring, head))) { netdev_err(netdev, "wrong head (%d, %d-%d)\n", head, ring->next_to_use, ring->next_to_clean); @@ -2174,7 +2174,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, bd_base_info = le32_to_cpu(desc->rx.bd_base_info); /* Check valid BD */ - if (!hnae_get_bit(bd_base_info, HNS3_RXD_VLD_B)) + if (unlikely(!hnae_get_bit(bd_base_info, HNS3_RXD_VLD_B))) return -EFAULT; va = (unsigned char *)desc_cb->buf + desc_cb->page_offset; |