From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 18 Aug 2023 19:44:22 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: block-6.6-2023-09-08~22^2~90
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7ff57803d24e0cb326251489d70f60462e3e6c04;p=linux-block.git

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e194997 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88ada ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

7ff57803d24e0cb326251489d70f60462e3e6c04
diff --cc drivers/net/ethernet/sfc/tc.c
index 246657222958,fe268b6c1cac..039180c61c83
--- a/drivers/net/ethernet/sfc/tc.c
+++ b/drivers/net/ethernet/sfc/tc.c
@@@ -2087,17 -1657,11 +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)