From 992d38d2b988a7d71c2416dad9af2b769f51ac25 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Fri, 22 Dec 2023 20:21:58 -0800 Subject: bnxt_en: Refactor bnxt_ntuple_filter structure. This is in preparation to support user defined L2 (ether) filters, which will have many similarities with ntuple filters. Refactor bnxt_ntuple_filter structure to have a bnxt_filter_base structure that can be re-used by the L2 filters. Reviewed-by: Vasundhara Volam Reviewed-by: Andy Gospodarek Reviewed-by: Pavan Chebbi Signed-off-by: Michael Chan Reviewed-by: Simon Horman Signed-off-by: David S. Miller --- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c') diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 7e49953a93fa..65edad2cfeab 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -1024,10 +1024,10 @@ static int bnxt_grxclsrlall(struct bnxt *bp, struct ethtool_rxnfc *cmd, head = &bp->ntp_fltr_hash_tbl[i]; rcu_read_lock(); - hlist_for_each_entry_rcu(fltr, head, hash) { + hlist_for_each_entry_rcu(fltr, head, base.hash) { if (j == cmd->rule_cnt) break; - rule_locs[j++] = fltr->sw_id; + rule_locs[j++] = fltr->base.sw_id; } rcu_read_unlock(); if (j == cmd->rule_cnt) @@ -1053,8 +1053,8 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd) head = &bp->ntp_fltr_hash_tbl[i]; rcu_read_lock(); - hlist_for_each_entry_rcu(fltr, head, hash) { - if (fltr->sw_id == fs->location) + hlist_for_each_entry_rcu(fltr, head, base.hash) { + if (fltr->base.sw_id == fs->location) goto fltr_found; } rcu_read_unlock(); @@ -1107,7 +1107,7 @@ fltr_found: fs->m_u.tcp_ip6_spec.pdst = cpu_to_be16(~0); } - fs->ring_cookie = fltr->rxq; + fs->ring_cookie = fltr->base.rxq; rc = 0; fltr_err: -- cgit