From: Xiao Liang <shaw.leon@gmail.com>
To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Jakub Kicinski <kuba@kernel.org>,
Donald Hunter <donald.hunter@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Ido Schimmel <idosch@nvidia.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Simon Horman <horms@kernel.org>, Shuah Khan <shuah@kernel.org>,
Jiri Pirko <jiri@resnulli.us>, Hangbin Liu <liuhangbin@gmail.com>,
linux-rdma@vger.kernel.org, linux-can@vger.kernel.org,
osmocom-net-gprs@lists.osmocom.org, bpf@vger.kernel.org,
linux-ppp@vger.kernel.org, wireguard@lists.zx2c4.com,
linux-wireless@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
bridge@lists.linux.dev, linux-wpan@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v7 08/11] rtnetlink: Remove "net" from newlink params
Date: Sat, 4 Jan 2025 20:57:29 +0800 [thread overview]
Message-ID: <20250104125732.17335-9-shaw.leon@gmail.com> (raw)
In-Reply-To: <20250104125732.17335-1-shaw.leon@gmail.com>
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>
---
include/net/rtnetlink.h | 2 --
net/core/rtnetlink.c | 6 ------
2 files changed, 8 deletions(-)
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index ed970b4568d1..04fc0e91af42 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -72,7 +72,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
/**
* struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink()
*
- * @net: Netns of interest
* @src_net: Source netns of rtnetlink socket
* @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified
* @peer_net: Peer netns
@@ -82,7 +81,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
* @extack: Netlink extended ACK
*/
struct rtnl_newlink_params {
- struct net *net;
struct net *src_net;
struct net *link_net;
struct net *peer_net;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f902b8a5189f..a2246bbaf2bc 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -3758,7 +3758,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
char ifname[IFNAMSIZ];
int err;
struct rtnl_newlink_params params = {
- .net = net,
.src_net = net,
.link_net = link_net,
.peer_net = peer_net,
@@ -3787,11 +3786,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
dev->ifindex = ifm->ifi_index;
params.dev = dev;
- if (link_net)
- params.net = link_net;
- if (peer_net)
- params.net = peer_net;
-
if (ops->newlink)
err = ops->newlink(¶ms);
else
--
2.47.1
next prev parent reply other threads:[~2025-01-04 12:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-04 12:57 [PATCH net-next v7 00/11] net: Improve netns handling in rtnetlink Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 01/11] rtnetlink: Lookup device in target netns when creating link Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 02/11] rtnetlink: Pack newlink() params into struct Xiao Liang
2025-01-07 20:38 ` Jakub Kicinski
2025-01-08 8:36 ` Xiao Liang
2025-01-08 17:31 ` Jakub Kicinski
2025-01-04 12:57 ` [PATCH net-next v7 03/11] net: Use link netns in newlink() of rtnl_link_ops Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 04/11] ieee802154: 6lowpan: " Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 05/11] net: ip_tunnel: " Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 06/11] net: ipv6: " Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 07/11] net: xfrm: " Xiao Liang
2025-01-04 12:57 ` Xiao Liang [this message]
2025-01-04 12:57 ` [PATCH net-next v7 09/11] rtnetlink: Create link directly in target net namespace Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 10/11] selftests: net: Add python context manager for netns entering Xiao Liang
2025-01-04 12:57 ` [PATCH net-next v7 11/11] selftests: net: Add test cases for link and peer netns Xiao Liang
2025-01-07 8:56 ` [PATCH net-next v7 00/11] net: Improve netns handling in rtnetlink Kuniyuki Iwashima
2025-01-07 10:46 ` Xiao Liang
2025-01-07 12:53 ` Xiao Liang
2025-01-07 14:47 ` Kuniyuki Iwashima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250104125732.17335-9-shaw.leon@gmail.com \
--to=shaw.leon@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bpf@vger.kernel.org \
--cc=bridge@lists.linux.dev \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-ppp@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=osmocom-net-gprs@lists.osmocom.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).