iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtnl: split __rtnl_newlink() into two functions

Browse Source 
__rtnl_newlink() is 250LoC, but has a few clear sections.
Move the part which creates a new netdev to a separate
function.

For ease of review code will be moved in the next change.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Jakub Kicinski 2022-04-29 16:55:07 -07:00 committed by Paolo Abeni
parent c92bf26cce
commit 63105e8398
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/core/rtnetlink.c
View File

@ -3302,6 +3302,11 @@ static int rtnl_group_changelink(const struct sk_buff *skb,
return 0; return 0;
} }
static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
const struct rtnl_link_ops *ops,
struct nlattr **tb, struct nlattr **data,
struct netlink_ext_ack *extack);
struct rtnl_newlink_tbs { struct rtnl_newlink_tbs {
struct nlattr *tb[IFLA_MAX + 1]; struct nlattr *tb[IFLA_MAX + 1];
struct nlattr *attr[RTNL_MAX_TYPE + 1]; struct nlattr *attr[RTNL_MAX_TYPE + 1];
@ -3312,19 +3317,16 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtnl_newlink_tbs *tbs, struct rtnl_newlink_tbs *tbs,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
unsigned char name_assign_type = NET_NAME_USER;
struct nlattr *linkinfo[IFLA_INFO_MAX + 1]; struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
struct nlattr ** const tb = tbs->tb; struct nlattr ** const tb = tbs->tb;
const struct rtnl_link_ops *m_ops; const struct rtnl_link_ops *m_ops;
struct net_device *master_dev; struct net_device *master_dev;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
const struct rtnl_link_ops *ops; const struct rtnl_link_ops *ops;
struct net *dest_net, *link_net;
struct nlattr **slave_data; struct nlattr **slave_data;
char kind[MODULE_NAME_LEN]; char kind[MODULE_NAME_LEN];
struct net_device *dev; struct net_device *dev;
struct ifinfomsg *ifm; struct ifinfomsg *ifm;
char ifname[IFNAMSIZ];
struct nlattr **data; struct nlattr **data;
bool link_specified; bool link_specified;
int err; int err;
@ -3484,6 +3486,21 @@ replay:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
return rtnl_newlink_create(skb, ifm, ops, tb, data, extack);
}
static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
const struct rtnl_link_ops *ops,
struct nlattr **tb, struct nlattr **data,
struct netlink_ext_ack *extack)
{
unsigned char name_assign_type = NET_NAME_USER;
struct net *net = sock_net(skb->sk);
struct net *dest_net, *link_net;
struct net_device *dev;
char ifname[IFNAMSIZ];
int err;
if (!ops->alloc && !ops->setup) if (!ops->alloc && !ops->setup)
return -EOPNOTSUPP; return -EOPNOTSUPP;