sfc: forget filters from sw table if hw replies ENOENT on removing them

If the hw doesn't think they exist, we should defer to its authority.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 7da96998488af946d65726d92daf31215a61dea1..ec976ffb273f77d367f6b51fc4ca56e3d596c40f 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -4309,13 +4309,18 @@ static int efx_ef10_filter_remove_internal(struct efx_nic *efx,
                               MC_CMD_FILTER_OP_IN_OP_UNSUBSCRIBE);
                MCDI_SET_QWORD(inbuf, FILTER_OP_IN_HANDLE,
                               table->entry[filter_idx].handle);
-               rc = efx_mcdi_rpc(efx, MC_CMD_FILTER_OP,
-                                 inbuf, sizeof(inbuf), NULL, 0, NULL);
+               rc = efx_mcdi_rpc_quiet(efx, MC_CMD_FILTER_OP,
+                                       inbuf, sizeof(inbuf), NULL, 0, NULL);
 
                spin_lock_bh(&efx->filter_lock);
-               if (rc == 0) {
+               if ((rc == 0) || (rc == -ENOENT)) {
+                       /* Filter removed OK or didn't actually exist */
                        kfree(spec);
                        efx_ef10_filter_set_entry(table, filter_idx, NULL, 0);
+               } else {
+                       efx_mcdi_display_error(efx, MC_CMD_FILTER_OP,
+                                              MC_CMD_FILTER_OP_IN_LEN,
+                                              NULL, 0, rc);
                }
        }