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

Commit 1ab35276 authored Jan 22, 2008 by Denis V. Lunev Committed by David S. Miller Jan 28, 2008

[NETNS]: Add namespace parameter to ip_dev_find.



in_dev_find() need a namespace to pass it to fib_get_table(), so add
an argument.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 010278ec

drivers/infiniband/core/addr.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ int rdma_translate_ip(struct sockaddr addr, struct rdma_dev_addr dev_addr)
	__be32 ip = ((struct sockaddr_in *) addr)->sin_addr.s_addr;		__be32 ip = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
	int ret;		int ret;

	dev = ip_dev_find(ip);		dev = ip_dev_find(&init_net, ip);
	if (!dev)		if (!dev)
	return -EADDRNOTAVAIL;		return -EADDRNOTAVAIL;

	@@ -261,7 +261,7 @@ static int addr_resolve_local(struct sockaddr_in *src_in,
	__be32 dst_ip = dst_in->sin_addr.s_addr;		__be32 dst_ip = dst_in->sin_addr.s_addr;
	int ret;		int ret;

	dev = ip_dev_find(dst_ip);		dev = ip_dev_find(&init_net, dst_ip);
	if (!dev)		if (!dev)
	return -EADDRNOTAVAIL;		return -EADDRNOTAVAIL;

drivers/infiniband/core/cma.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1289,7 +1289,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
	atomic_inc(&conn_id->dev_remove);		atomic_inc(&conn_id->dev_remove);
	conn_id->state = CMA_CONNECT;		conn_id->state = CMA_CONNECT;

	dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr);		dev = ip_dev_find(&init_net, iw_event->local_addr.sin_addr.s_addr);
	if (!dev) {		if (!dev) {
	ret = -EADDRNOTAVAIL;		ret = -EADDRNOTAVAIL;
	cma_enable_remove(conn_id);		cma_enable_remove(conn_id);

include/linux/inetdevice.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,7 @@ struct in_ifaddr
	extern int register_inetaddr_notifier(struct notifier_block *nb);		extern int register_inetaddr_notifier(struct notifier_block *nb);
	extern int unregister_inetaddr_notifier(struct notifier_block *nb);		extern int unregister_inetaddr_notifier(struct notifier_block *nb);

	extern struct net_device *ip_dev_find(__be32 addr);		extern struct net_device ip_dev_find(struct net net, __be32 addr);
	extern int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);		extern int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);
	extern int devinet_ioctl(unsigned int cmd, void __user *);		extern int devinet_ioctl(unsigned int cmd, void __user *);
	extern void devinet_init(void);		extern void devinet_init(void);

net/ipv4/fib_frontend.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -153,7 +153,7 @@ static void fib_flush(struct net *net)
	* Find the first device with a given source address.		* Find the first device with a given source address.
	*/		*/

	struct net_device * ip_dev_find(__be32 addr)		struct net_device * ip_dev_find(struct net *net, __be32 addr)
	{		{
	struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } };		struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } };
	struct fib_result res;		struct fib_result res;
	@@ -164,7 +164,7 @@ struct net_device * ip_dev_find(__be32 addr)
	res.r = NULL;		res.r = NULL;
	#endif		#endif

	local_table = fib_get_table(&init_net, RT_TABLE_LOCAL);		local_table = fib_get_table(net, RT_TABLE_LOCAL);
	if (!local_table \|\| local_table->tb_lookup(local_table, &fl, &res))		if (!local_table \|\| local_table->tb_lookup(local_table, &fl, &res))
	return NULL;		return NULL;
	if (res.type != RTN_LOCAL)		if (res.type != RTN_LOCAL)

net/ipv4/igmp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1395,7 +1395,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
	return idev;		return idev;
	}		}
	if (imr->imr_address.s_addr) {		if (imr->imr_address.s_addr) {
	dev = ip_dev_find(imr->imr_address.s_addr);		dev = ip_dev_find(&init_net, imr->imr_address.s_addr);
	if (!dev)		if (!dev)
	return NULL;		return NULL;
	dev_put(dev);		dev_put(dev);