admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT

Browse Source 
This preserves the existing IFLA_DSA_MASTER which is part of the uAPI
and creates an alias named IFLA_DSA_CONDUIT.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20231023181729.1191071-3-florian.fainelli@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Florian Fainelli
2023-10-23 11:17:29 -07:00
committed by Jakub Kicinski
parent 6ca80638b9
commit 87cd83714f
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/netlink.c
View File

@@ -8,7 +8,7 @@
#include "user.h"
static const struct nla_policy dsa_policy[IFLA_DSA_MAX + 1] = {
[IFLA_DSA_MASTER] = { .type = NLA_U32 },
[IFLA_DSA_CONDUIT] = { .type = NLA_U32 },
};
static int dsa_changelink(struct net_device *dev, struct nlattr *tb[],
@@ -20,8 +20,8 @@ static int dsa_changelink(struct net_device *dev, struct nlattr *tb[],
if (!data)
return 0;
if (data[IFLA_DSA_MASTER]) {
u32 ifindex = nla_get_u32(data[IFLA_DSA_MASTER]);
if (data[IFLA_DSA_CONDUIT]) {
u32 ifindex = nla_get_u32(data[IFLA_DSA_CONDUIT]);
struct net_device *conduit;
conduit = __dev_get_by_index(dev_net(dev), ifindex);
@@ -38,7 +38,7 @@ static int dsa_changelink(struct net_device *dev, struct nlattr *tb[],
static size_t dsa_get_size(const struct net_device *dev)
{
return nla_total_size(sizeof(u32)) + /* IFLA_DSA_MASTER */
return nla_total_size(sizeof(u32)) + /* IFLA_DSA_CONDUIT */
0;
}
@@ -46,7 +46,7 @@ static int dsa_fill_info(struct sk_buff *skb, const struct net_device *dev)
{
struct net_device *conduit = dsa_user_to_conduit(dev);
if (nla_put_u32(skb, IFLA_DSA_MASTER, conduit->ifindex))
if (nla_put_u32(skb, IFLA_DSA_CONDUIT, conduit->ifindex))
return -EMSGSIZE;
return 0;