mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 13:19:56 -04:00
rtnetlink: Remove "net" from newlink params
Now that devices have been converted to use the specific netns instead of ambiguous "net", let's remove it from newlink parameters. Signed-off-by: Xiao Liang <shaw.leon@gmail.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://patch.msgid.link/20250219125039.18024-11-shaw.leon@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
5314e3d684
commit
9c0fc091dc
@@ -72,7 +72,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
|
|||||||
/**
|
/**
|
||||||
* struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink()
|
* struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink()
|
||||||
*
|
*
|
||||||
* @net: Netns of interest
|
|
||||||
* @src_net: Source netns of rtnetlink socket
|
* @src_net: Source netns of rtnetlink socket
|
||||||
* @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified
|
* @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified
|
||||||
* @peer_net: Peer netns
|
* @peer_net: Peer netns
|
||||||
@@ -80,7 +79,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
|
|||||||
* @data: IFLA_INFO_DATA attributes
|
* @data: IFLA_INFO_DATA attributes
|
||||||
*/
|
*/
|
||||||
struct rtnl_newlink_params {
|
struct rtnl_newlink_params {
|
||||||
struct net *net;
|
|
||||||
struct net *src_net;
|
struct net *src_net;
|
||||||
struct net *link_net;
|
struct net *link_net;
|
||||||
struct net *peer_net;
|
struct net *peer_net;
|
||||||
|
|||||||
@@ -3798,12 +3798,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
|
|||||||
|
|
||||||
dev->ifindex = ifm->ifi_index;
|
dev->ifindex = ifm->ifi_index;
|
||||||
|
|
||||||
params.net = params.src_net;
|
|
||||||
if (link_net)
|
|
||||||
params.net = link_net;
|
|
||||||
if (peer_net)
|
|
||||||
params.net = peer_net;
|
|
||||||
|
|
||||||
if (ops->newlink)
|
if (ops->newlink)
|
||||||
err = ops->newlink(dev, ¶ms, extack);
|
err = ops->newlink(dev, ¶ms, extack);
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user