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 <[email protected]>
---
 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(&params);
        else
-- 
2.47.1

Reply via email to