Commit a27fb314 authored by Rahul Lakkireddy's avatar Rahul Lakkireddy Committed by David S. Miller
Browse files

cxgb4: fix regression with HASH tc prio value update 



commit db43b30c ("cxgb4: add ethtool n-tuple filter deletion")
has moved searching for next highest priority HASH filter rule to
cxgb4_flow_rule_destroy(), which searches the rhashtable before the
the rule is removed from it and hence always finds at least 1 entry.
Fix by removing the rule from rhashtable first before calling
cxgb4_flow_rule_destroy() and hence avoid fetching stale info.

Fixes: db43b30c ("cxgb4: add ethtool n-tuple filter deletion")
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0310182

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+5 −9
Original line number Diff line number Diff line
@@ -997,20 +997,16 @@ int cxgb4_tc_flower_destroy(struct net_device *dev, 
	if (!ch_flower)

		return -ENOENT;



	rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,

			       adap->flower_ht_params);



	ret = cxgb4_flow_rule_destroy(dev, ch_flower->fs.tc_prio,

				      &ch_flower->fs, ch_flower->filter_id);

	if (ret)

		goto err;

		netdev_err(dev, "Flow rule destroy failed for tid: %u, ret: %d",

			   ch_flower->filter_id, ret);



	ret = rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,

				     adap->flower_ht_params);

	if (ret) {

		netdev_err(dev, "Flow remove from rhashtable failed");

		goto err;

	}

	kfree_rcu(ch_flower, rcu);



err:

	return ret;

}