OSDN Git Service

net: hns3: fix the descriptor index when get rss type
authorPeng Li <lipeng321@huawei.com>
Thu, 20 Dec 2018 03:52:05 +0000 (11:52 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Dec 2018 07:47:59 +0000 (23:47 -0800)
Driver gets rss information from the last descriptor of the packet.
When driver handle the rss type, ring->next_to_clean indicates the
first descriptor of next packet.

This patch fix the descriptor index with "ring->next_to_clean - 1".

Fixes: 232fc64b6e62 ("net: hns3: Add HW RSS hash information to RX skb")
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 624b8a7..d3b9aaf 100644 (file)
@@ -2550,9 +2550,16 @@ static void hns3_set_gro_param(struct sk_buff *skb, u32 l234info,
 static void hns3_set_rx_skb_rss_type(struct hns3_enet_ring *ring,
                                     struct sk_buff *skb)
 {
-       struct hns3_desc *desc = &ring->desc[ring->next_to_clean];
        struct hnae3_handle *handle = ring->tqp->handle;
        enum pkt_hash_types rss_type;
+       struct hns3_desc *desc;
+       int last_bd;
+
+       /* When driver handle the rss type, ring->next_to_clean indicates the
+        * first descriptor of next packet, need -1 here.
+        */
+       last_bd = (ring->next_to_clean - 1 + ring->desc_num) % ring->desc_num;
+       desc = &ring->desc[last_bd];
 
        if (le32_to_cpu(desc->rx.rss_hash))
                rss_type = handle->kinfo.rss_type;