Merge: hsr: use netdev_master_upper_dev_link() when linking lower ports

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1469

hsr: use netdev_master_upper_dev_link() when linking lower ports

JIRA: https://issues.redhat.com/browse/RHEL-100715
Upstream Status: net.git commit d67ca09

commit d67ca09
Author: Hangbin Liu <liuhangbin@gmail.com>
Date:   Tue Sep 2 06:55:58 2025 +0000

    hsr: use netdev_master_upper_dev_link() when linking lower ports

    Unlike VLAN devices, HSR changes the lower device’s rx_handler, which
    prevents the lower device from being attached to another master.
    Switch to using netdev_master_upper_dev_link() when setting up the lower
    device.

    This could improves user experience, since ip link will now display the
    HSR device as the master for its ports.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
    Link: https://patch.msgid.link/20250902065558.360927-1-liuhangbin@gmail.com
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Signed-off-by: Hangbin Liu <haliu@redhat.com>

Approved-by: Antoine Tenart <atenart@redhat.com>
Approved-by: Felix Maurer <fmaurer@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>

Author: CKI KWF Bot

net/hsr/hsr_slave.c

@@ -137,6 +137,7 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
 			     struct netlink_ext_ack *extack)
 
 {
+	struct netdev_lag_upper_info lag_upper_info;
 	struct net_device *hsr_dev;
 	struct hsr_port *master;
 	int res;
@@ -153,7 +154,9 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
 	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
 	hsr_dev = master->dev;
 
-	res = netdev_upper_dev_link(dev, hsr_dev, extack);
+	lag_upper_info.tx_type = NETDEV_LAG_TX_TYPE_BROADCAST;
+	lag_upper_info.hash_type = NETDEV_LAG_HASH_UNKNOWN;
+	res = netdev_master_upper_dev_link(dev, hsr_dev, NULL, &lag_upper_info, extack);
 	if (res)
 		goto fail_upper_dev_link;