[][kernel][common][eth][Add netdev_upper_dev_link feature to the dsa_slave_create() function]
[Description]
Add netdev_upper_dev_link feature to the dsa_slave_create() function.
This feature is a backport from kernel-5.15 that can assist the DSA
driver in managing the lower/upper interface.
[Release-log]
N/A
Change-Id: Idcc06ff70dc6fb2d6a4f98496ea8377ebea4def1
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8357223
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
index b01d689..89e664f 100644
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
@@ -14,8 +14,7 @@
net/bridge/br_vlan.c | 698 +++++++++++++++++++++++++++++++--
net/bridge/br_vlan_options.c | 346 ++++++++++++++++
net/core/rtnetlink.c | 1 +
- net/dsa/slave.c | 11 +
- 11 files changed, 1365 insertions(+), 34 deletions(-)
+ 10 files changed, 1354 insertions(+), 34 deletions(-)
create mode 100644 net/bridge/br_vlan_options.c
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
@@ -1817,30 +1816,6 @@
err = rtnl_fill_ifinfo(skb, dev, net,
RTM_NEWLINK,
NETLINK_CB(cb->skb).portid,
-diff --git a/net/dsa/slave.c b/net/dsa/slave.c
-index 2dfaa1e..a60a26c 100644
---- a/net/dsa/slave.c
-+++ b/net/dsa/slave.c
-@@ -1495,8 +1495,19 @@ int dsa_slave_create(struct dsa_port *port)
- goto out_phy;
- }
-
-+ rtnl_lock();
-+
-+ ret = netdev_upper_dev_link(master, slave_dev, NULL);
-+
-+ rtnl_unlock();
-+
-+ if (ret)
-+ goto out_unregister;
-+
- return 0;
-
-+out_unregister:
-+ unregister_netdev(slave_dev);
- out_phy:
- rtnl_lock();
- phylink_disconnect_phy(p->dp->pl);
--
2.18.0
diff --git a/target/linux/mediatek/patches-5.4/999-1714-v5.15-net-dsa-add-netdev_upper_dev_link.patch b/target/linux/mediatek/patches-5.4/999-1714-v5.15-net-dsa-add-netdev_upper_dev_link.patch
new file mode 100644
index 0000000..2b854c4
--- /dev/null
+++ b/target/linux/mediatek/patches-5.4/999-1714-v5.15-net-dsa-add-netdev_upper_dev_link.patch
@@ -0,0 +1,36 @@
+From 120baca4e8b019d03c8d1a29012cea911629247a Mon Sep 17 00:00:00 2001
+From: Bc-bocun Chen <bc-bocun.chen@mediatek.com>
+Date: Mon, 18 Sep 2023 11:13:51 +0800
+Subject: [PATCH] net dsa add netdev_upper_dev_link
+
+---
+ net/dsa/slave.c | 11 +
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/net/dsa/slave.c b/net/dsa/slave.c
+index 2dfaa1e..a60a26c 100644
+--- a/net/dsa/slave.c
++++ b/net/dsa/slave.c
+@@ -1495,8 +1495,19 @@ int dsa_slave_create(struct dsa_port *port)
+ goto out_phy;
+ }
+
++ rtnl_lock();
++
++ ret = netdev_upper_dev_link(master, slave_dev, NULL);
++
++ rtnl_unlock();
++
++ if (ret)
++ goto out_unregister;
++
+ return 0;
+
++out_unregister:
++ unregister_netdev(slave_dev);
+ out_phy:
+ rtnl_lock();
+ phylink_disconnect_phy(p->dp->pl);
+--
+2.18.0
+