net: rename netdev_phys_port_id to more generic name

So this can be reused for identification of other "items" as well.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Reviewed-by: Thomas Graf <tgraf@suug.ch>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 5 insertions, 5 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ac4836241a96..0814a560e5f3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5846,7 +5846,7 @@ EXPORT_SYMBOL(dev_change_carrier);
  *      Get device physical port ID
  */
 int dev_get_phys_port_id(struct net_device *dev,
-                         struct netdev_phys_port_id *ppid)
+                         struct netdev_phys_item_id *ppid)
 {
         const struct net_device_ops *ops = dev->netdev_ops;
 
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 1a24602cd54e..26c46f4726c5 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -404,7 +404,7 @@ static ssize_t phys_port_id_show(struct device *dev,
                 return restart_syscall();
 
         if (dev_isalive(netdev)) {
-                struct netdev_phys_port_id ppid;
+                struct netdev_phys_item_id ppid;
 
                 ret = dev_get_phys_port_id(netdev, &ppid);
                 if (!ret)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 1a233c1c8ab4..0640f1fbe9dd 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -869,7 +869,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
                + rtnl_port_size(dev, ext_filter_mask) /* IFLA_VF_PORTS + IFLA_PORT_SELF */
                + rtnl_link_get_size(dev) /* IFLA_LINKINFO */
                + rtnl_link_get_af_size(dev) /* IFLA_AF_SPEC */
-               + nla_total_size(MAX_PHYS_PORT_ID_LEN); /* IFLA_PHYS_PORT_ID */
+               + nla_total_size(MAX_PHYS_ITEM_ID_LEN); /* IFLA_PHYS_PORT_ID */
 }
 
 static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
@@ -953,7 +953,7 @@ static int rtnl_port_fill(struct sk_buff *skb, struct net_device *dev,
 static int rtnl_phys_port_id_fill(struct sk_buff *skb, struct net_device *dev)
 {
         int err;
-        struct netdev_phys_port_id ppid;
+        struct netdev_phys_item_id ppid;
 
         err = dev_get_phys_port_id(dev, &ppid);
         if (err) {
@@ -1197,7 +1197,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
         [IFLA_PROMISCUITY]      = { .type = NLA_U32 },
         [IFLA_NUM_TX_QUEUES]    = { .type = NLA_U32 },
         [IFLA_NUM_RX_QUEUES]    = { .type = NLA_U32 },
-        [IFLA_PHYS_PORT_ID]     = { .type = NLA_BINARY, .len = MAX_PHYS_PORT_ID_LEN },
+        [IFLA_PHYS_PORT_ID]     = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
         [IFLA_CARRIER_CHANGES]  = { .type = NLA_U32 },  /* ignored */
 };