OSDN Git Service

net: hns3: Removes unnecessary check when clearing TX/RX rings
authorFuyun Liang <liangfuyun1@huawei.com>
Fri, 25 May 2018 18:43:03 +0000 (19:43 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 May 2018 04:04:26 +0000 (00:04 -0400)
Our code will ensure that hns3_clear_tx_ring is not used to cleared
RX rings and hns3_clear_rx_ring is not used to cleared TX rings. So
the ring type check is unnecessary.

Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index d1ef104..4c13c52 100644 (file)
@@ -3217,9 +3217,6 @@ static void hns3_recover_hw_addr(struct net_device *ndev)
 
 static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)
 {
-       if (!HNAE3_IS_TX_RING(ring))
-               return;
-
        while (ring->next_to_clean != ring->next_to_use) {
                hns3_free_buffer_detach(ring, ring->next_to_clean);
                ring_ptr_move_fw(ring, next_to_clean);
@@ -3228,9 +3225,6 @@ static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)
 
 static void hns3_clear_rx_ring(struct hns3_enet_ring *ring)
 {
-       if (HNAE3_IS_TX_RING(ring))
-               return;
-
        while (ring->next_to_use != ring->next_to_clean) {
                /* When a buffer is not reused, it's memory has been
                 * freed in hns3_handle_rx_bd or will be freed by