Skip to content

Commit 9d11e97

Browse files
committed
Merge branch 'fix-some-bugs-in-the-flow-director-of-hns3-driver'
Jijie Shao says: ==================== fix some bugs in the flow director of HNS3 driver This patchset fixes two bugs in the flow director: 1. Incorrect definition of HCLGE_FD_AD_COUNTER_NUM_M 2. Incorrect assignment of HCLGE_FD_AD_NXT_KEY ==================== Link: https://patch.msgid.link/20260119132840.410513-1-shaojijie@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 5228e9f + f87e034 commit 9d11e97

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ struct hclge_fd_tcam_config_3_cmd {
731731
#define HCLGE_FD_AD_QID_M GENMASK(11, 2)
732732
#define HCLGE_FD_AD_USE_COUNTER_B 12
733733
#define HCLGE_FD_AD_COUNTER_NUM_S 13
734-
#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(20, 13)
734+
#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(19, 13)
735735
#define HCLGE_FD_AD_NXT_STEP_B 20
736736
#define HCLGE_FD_AD_NXT_KEY_S 21
737737
#define HCLGE_FD_AD_NXT_KEY_M GENMASK(25, 21)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5690,7 +5690,7 @@ static int hclge_fd_ad_config(struct hclge_dev *hdev, u8 stage, int loc,
56905690
HCLGE_FD_AD_COUNTER_NUM_S, action->counter_id);
56915691
hnae3_set_bit(ad_data, HCLGE_FD_AD_NXT_STEP_B, action->use_next_stage);
56925692
hnae3_set_field(ad_data, HCLGE_FD_AD_NXT_KEY_M, HCLGE_FD_AD_NXT_KEY_S,
5693-
action->counter_id);
5693+
action->next_input_key);
56945694

56955695
req->ad_data = cpu_to_le64(ad_data);
56965696
ret = hclge_cmd_send(&hdev->hw, &desc, 1);

0 commit comments

Comments
 (0)