Commit cb5bdd29 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Add bnxt_lookup_ntp_filter_from_idx() function 



Add the helper function to look up the ntuple filter from the
hash index and use it in bnxt_rx_flow_steer().  The helper function
will also be used by user defined ntuple filters in the next
patches.

Reviewed-by: default avatarAndy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3c98285

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+20 −6
Original line number Diff line number Diff line
@@ -13899,6 +13899,21 @@ static bool bnxt_fltr_match(struct bnxt_ntuple_filter *f1, 
	return false;

}



static struct bnxt_ntuple_filter *

bnxt_lookup_ntp_filter_from_idx(struct bnxt *bp,

				struct bnxt_ntuple_filter *fltr, u32 idx)

{

	struct bnxt_ntuple_filter *f;

	struct hlist_head *head;



	head = &bp->ntp_fltr_hash_tbl[idx];

	hlist_for_each_entry_rcu(f, head, base.hash) {

		if (bnxt_fltr_match(f, fltr))

			return f;

	}

	return NULL;

}



static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,

			      u16 rxq_index, u32 flow_id)

{
@@ -13963,13 +13978,12 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
	idx = bnxt_get_ntp_filter_idx(bp, fkeys, skb);

	head = &bp->ntp_fltr_hash_tbl[idx];

	rcu_read_lock();

	hlist_for_each_entry_rcu(fltr, head, base.hash) {

		if (bnxt_fltr_match(fltr, new_fltr)) {

			rc = fltr->base.sw_id;

	fltr = bnxt_lookup_ntp_filter_from_idx(bp, new_fltr, idx);

	if (fltr) {

		rcu_read_unlock();

		rc = fltr->base.sw_id;

		goto err_free;

	}

	}

	rcu_read_unlock();



	spin_lock_bh(&bp->ntp_fltr_lock);