Commit 4bdf89e8 authored Apr 24, 2020 by Andre Guedes Committed by Jeff Kirsher May 22, 2020

igc: Fix NFC rule overwrite cases



When the 'loc' argument is passed in ethtool, the input rule overwrites
any rule present in that location. In this situation we must disable the
old rule otherwise it is left enabled in hardware. This patch fixes
the issue by always calling igc_disable_nfc_rule() when deleting the
old rule, no matter the value of 'input' argument.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent b500350a

drivers/net/ethernet/intel/igc/igc_ethtool.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1270,7 +1270,6 @@ static int igc_ethtool_update_nfc_rule(struct igc_adapter *adapter,

		/* if there is an old rule occupying our place remove it */
		if (rule && rule->location == location) {
		if (!input)
		err = igc_disable_nfc_rule(adapter, rule);

		hlist_del(&rule->nfc_node);

Admin message