From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 5 Oct 2023 20:16:31 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a;p=linux.git

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

Cross-merge networking fixes after downstream PR.

No conflicts (or adjacent changes of note).

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

2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a
diff --cc include/net/ip_fib.h
index 84b0a82c9df42,15de07d365405..d4667b7797e3e
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@@ -154,9 -154,10 +154,10 @@@ struct fib_info 
  	int			fib_nhs;
  	bool			fib_nh_is_v6;
  	bool			nh_updated;
+ 	bool			pfsrc_removed;
  	struct nexthop		*nh;
  	struct rcu_head		rcu;
 -	struct fib_nh		fib_nh[];
 +	struct fib_nh		fib_nh[] __counted_by(fib_nhs);
  };