From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Jul 2021 09:46:23 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.4.277~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4879c77429d5c5293464fc0457e184ba003e6540;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	bonding-fix-build-issue.patch
---

diff --git a/queue-5.10/bonding-fix-build-issue.patch b/queue-5.10/bonding-fix-build-issue.patch
new file mode 100644
index 00000000000..c5a49efd590
--- /dev/null
+++ b/queue-5.10/bonding-fix-build-issue.patch
@@ -0,0 +1,38 @@
+From 5b69874f74cc5707edd95fcdaa757c507ac8af0f Mon Sep 17 00:00:00 2001
+From: Mahesh Bandewar <maheshb@google.com>
+Date: Fri, 16 Jul 2021 16:09:41 -0700
+Subject: bonding: fix build issue
+
+From: Mahesh Bandewar <maheshb@google.com>
+
+commit 5b69874f74cc5707edd95fcdaa757c507ac8af0f upstream.
+
+The commit 9a5605505d9c (" bonding: Add struct bond_ipesc to manage SA") is causing
+following build error when XFRM is not selected in kernel config.
+
+lld: error: undefined symbol: xfrm_dev_state_flush
+>>> referenced by bond_main.c:3453 (drivers/net/bonding/bond_main.c:3453)
+>>>               net/bonding/bond_main.o:(bond_netdev_event) in archive drivers/built-in.a
+
+Fixes: 9a5605505d9c (" bonding: Add struct bond_ipesc to manage SA")
+Signed-off-by: Mahesh Bandewar <maheshb@google.com>
+CC: Taehee Yoo <ap420073@gmail.com>
+CC: Jay Vosburgh <jay.vosburgh@canonical.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/bonding/bond_main.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -3416,7 +3416,9 @@ static int bond_master_netdev_event(unsi
+ 		return bond_event_changename(event_bond);
+ 	case NETDEV_UNREGISTER:
+ 		bond_remove_proc_entry(event_bond);
++#ifdef CONFIG_XFRM_OFFLOAD
+ 		xfrm_dev_state_flush(dev_net(bond_dev), bond_dev, true);
++#endif /* CONFIG_XFRM_OFFLOAD */
+ 		break;
+ 	case NETDEV_REGISTER:
+ 		bond_create_proc_entry(event_bond);
diff --git a/queue-5.10/series b/queue-5.10/series
index 28366d64315..e77a1d88677 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -159,3 +159,4 @@ drm-amdgpu-update-golden-setting-for-sienna_cichlid.patch
 net-dsa-mv88e6xxx-enable-serdes-rx-stats-for-topaz.patch
 net-dsa-mv88e6xxx-enable-serdes-pcs-register-dump-via-ethtool-d-on-topaz.patch
 pci-mark-amd-navi14-gpu-ats-as-broken.patch
+bonding-fix-build-issue.patch