Skip to content

Commit 16ec917

Browse files
leonshawNipaLocal
authored andcommitted
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> Signed-off-by: NipaLocal <nipa@local>
1 parent 571c09d commit 16ec917

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

include/net/rtnetlink.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
7272
/**
7373
* struct rtnl_newlink_params - parameters of rtnl_link_ops::newlink()
7474
*
75-
* @net: Netns of interest
7675
* @src_net: Source netns of rtnetlink socket
7776
* @link_net: Link netns by IFLA_LINK_NETNSID, NULL if not specified
7877
* @peer_net: Peer netns
@@ -82,7 +81,6 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
8281
* @extack: Netlink extended ACK
8382
*/
8483
struct rtnl_newlink_params {
85-
struct net *net;
8684
struct net *src_net;
8785
struct net *link_net;
8886
struct net *peer_net;

net/core/rtnetlink.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3764,7 +3764,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
37643764
char ifname[IFNAMSIZ];
37653765
int err;
37663766
struct rtnl_newlink_params params = {
3767-
.net = net,
37683767
.src_net = net,
37693768
.link_net = link_net,
37703769
.peer_net = peer_net,
@@ -3793,11 +3792,6 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
37933792
dev->ifindex = ifm->ifi_index;
37943793
params.dev = dev;
37953794

3796-
if (link_net)
3797-
params.net = link_net;
3798-
if (peer_net)
3799-
params.net = peer_net;
3800-
38013795
if (ops->newlink)
38023796
err = ops->newlink(&params);
38033797
else

0 commit comments

Comments
 (0)