sfc: TC probe fixes
Status from this message: This series was applied to netdev/net.git (main)
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 All 2 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | sfc: don't unregister flow_indr if it was never registereddrivers/ | +1 | 0 replies | Applied |
| 2/2 | sfc: don't fail probe if MAE/TC setup failsdrivers/ | +1 | 0 replies | Applied |
Reviews trailers per patch
All 2 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Martin Habets | Simon Horman |
|---|---|---|
| Series | R-b | |
| 1/2 | R-b | |
| 2/2 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH net 0/2] sfc: TC probe fixes
From: Edward Cree <[email protected]>
Fix a couple of minor infelicities in the error paths of EF100 TC
offload setup at probe time. Both found by code inspection.
Patch #1 will produce a conflict when merging net into net-next
(with 3bf969e88ada ("sfc: add MAE table machinery for conntrack table")); the resolution is appended.
Edward Cree (2):
sfc: don't unregister flow_indr if it was never registered
sfc: don't fail probe if MAE/TC setup fails
drivers/net/ethernet/sfc/ef100_nic.c | 2 +- drivers/net/ethernet/sfc/tc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
---
drivers/net/ethernet/sfc/tc.c +0 -0
@@@ -1657,11 -2087,17 +2087,17 @@@ int efx_init_tc(struct efx_nic *efx rc =efx_tc_configure_fallback_acts_reps (efx);if (rc)return rc; - rc =flow_indr_dev_register (efx_tc_indr_setup_cb, efx); + rc =efx_mae_get_tables (efx);if (rc)return rc; - efx->tc->up = true; + rc =flow_indr_dev_register (efx_tc_indr_setup_cb, efx); +if (rc) + goto out_free; + efx->tc->up = true;return 0 ; + out_free: +efx_mae_free_tables (efx); +return rc; }void efx_fini_tc (struct efx_nic *efx)