|
@@ -44,6 +44,7 @@
|
|
|
|
|
|
#include <linux/inet.h>
|
|
|
#include <linux/netdevice.h>
|
|
|
+#include <net/switchdev.h>
|
|
|
#include <net/ip.h>
|
|
|
#include <net/protocol.h>
|
|
|
#include <net/arp.h>
|
|
@@ -869,7 +870,8 @@ 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_ITEM_ID_LEN); /* IFLA_PHYS_PORT_ID */
|
|
|
+ + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_PORT_ID */
|
|
|
+ + nla_total_size(MAX_PHYS_ITEM_ID_LEN); /* IFLA_PHYS_SWITCH_ID */
|
|
|
}
|
|
|
|
|
|
static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
|
|
@@ -968,6 +970,24 @@ static int rtnl_phys_port_id_fill(struct sk_buff *skb, struct net_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
|
|
|
+{
|
|
|
+ int err;
|
|
|
+ struct netdev_phys_item_id psid;
|
|
|
+
|
|
|
+ err = netdev_switch_parent_id_get(dev, &psid);
|
|
|
+ if (err) {
|
|
|
+ if (err == -EOPNOTSUPP)
|
|
|
+ return 0;
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (nla_put(skb, IFLA_PHYS_SWITCH_ID, psid.id_len, psid.id))
|
|
|
+ return -EMSGSIZE;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
|
|
|
int type, u32 pid, u32 seq, u32 change,
|
|
|
unsigned int flags, u32 ext_filter_mask)
|
|
@@ -1040,6 +1060,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
|
|
|
if (rtnl_phys_port_id_fill(skb, dev))
|
|
|
goto nla_put_failure;
|
|
|
|
|
|
+ if (rtnl_phys_switch_id_fill(skb, dev))
|
|
|
+ goto nla_put_failure;
|
|
|
+
|
|
|
attr = nla_reserve(skb, IFLA_STATS,
|
|
|
sizeof(struct rtnl_link_stats));
|
|
|
if (attr == NULL)
|
|
@@ -1199,6 +1222,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
|
|
|
[IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 },
|
|
|
[IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
|
|
|
[IFLA_CARRIER_CHANGES] = { .type = NLA_U32 }, /* ignored */
|
|
|
+ [IFLA_PHYS_SWITCH_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
|
|
|
};
|
|
|
|
|
|
static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
|