Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit c0713563 authored Nov 30, 2012 by Rami Rosen Committed by David S. Miller Nov 30, 2012

rtnelink: remove unused parameter from rtnl_create_link().



This patch removes an unused parameter (src_net) from rtnl_create_link()
method and from the method single invocation, in veth.
This parameter was used in the past when calling
ops->get_tx_queues(src_net, tb) in rtnl_create_link().
The get_tx_queues() member of rtnl_link_ops was replaced by two methods,
get_num_tx_queues() and get_num_rx_queues(), which do not get any
parameter. This was done in commit d40156aa by
Jiri Pirko ("rtnl: allow to specify different num for rx and tx queue count").

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent dad52fd9

drivers/net/veth.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -340,7 +340,7 @@ static int veth_newlink(struct net src_net, struct net_device dev,
	if (IS_ERR(net))		if (IS_ERR(net))
	return PTR_ERR(net);		return PTR_ERR(net);

	peer = rtnl_create_link(src_net, net, ifname, &veth_link_ops, tbp);		peer = rtnl_create_link(net, ifname, &veth_link_ops, tbp);
	if (IS_ERR(peer)) {		if (IS_ERR(peer)) {
	put_net(net);		put_net(net);
	return PTR_ERR(peer);		return PTR_ERR(peer);

include/net/rtnetlink.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -125,7 +125,7 @@ extern void rtnl_af_unregister(struct rtnl_af_ops *ops);


	extern struct net rtnl_link_get_net(struct net src_net, struct nlattr *tb[]);		extern struct net rtnl_link_get_net(struct net src_net, struct nlattr *tb[]);
	extern struct net_device rtnl_create_link(struct net src_net, struct net *net,		extern struct net_device rtnl_create_link(struct net net,
	char ifname, const struct rtnl_link_ops ops, struct nlattr *tb[]);		char ifname, const struct rtnl_link_ops ops, struct nlattr *tb[]);
	extern int rtnl_configure_link(struct net_device *dev,		extern int rtnl_configure_link(struct net_device *dev,
	const struct ifinfomsg *ifm);		const struct ifinfomsg *ifm);

net/core/rtnetlink.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1642,7 +1642,7 @@ int rtnl_configure_link(struct net_device dev, const struct ifinfomsg ifm)
	}		}
	EXPORT_SYMBOL(rtnl_configure_link);		EXPORT_SYMBOL(rtnl_configure_link);

	struct net_device rtnl_create_link(struct net src_net, struct net *net,		struct net_device rtnl_create_link(struct net net,
	char ifname, const struct rtnl_link_ops ops, struct nlattr *tb[])		char ifname, const struct rtnl_link_ops ops, struct nlattr *tb[])
	{		{
	int err;		int err;
	@@ -1840,7 +1840,7 @@ replay:
	if (IS_ERR(dest_net))		if (IS_ERR(dest_net))
	return PTR_ERR(dest_net);		return PTR_ERR(dest_net);

	dev = rtnl_create_link(net, dest_net, ifname, ops, tb);		dev = rtnl_create_link(dest_net, ifname, ops, tb);
	if (IS_ERR(dev)) {		if (IS_ERR(dev)) {
	err = PTR_ERR(dev);		err = PTR_ERR(dev);
	goto out;		goto out;