batman-adv: iv_ogm_send_to_if, declare char* as const

[deliverable/linux.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4238d6da5c60dc7ac7def10fb4e3ddda0a9377e6..18b34d771ed4dc7415a17cfdab83e56ee5683d02 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -458,11 +458,15 @@ static ssize_t phys_switch_id_show(struct device *dev,
                return restart_syscall();
 
        if (dev_isalive(netdev)) {
-               struct netdev_phys_item_id ppid;
+               struct switchdev_attr attr = {
+                       .id = SWITCHDEV_ATTR_PORT_PARENT_ID,
+                       .flags = SWITCHDEV_F_NO_RECURSE,
+               };
 
-               ret = netdev_switch_parent_id_get(netdev, &ppid);
+               ret = switchdev_port_attr_get(netdev, &attr);
                if (!ret)
-                       ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);
+                       ret = sprintf(buf, "%*phN\n", attr.u.ppid.id_len,
+                                     attr.u.ppid.id);
        }
        rtnl_unlock();