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

Commit 9f9354b9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: net/ipv4/devinet.c cleanups 



As pointed by Stephen Rothwell, commit c6d14c84 added a warning :

net/ipv4/devinet.c: In function 'inet_select_addr':
net/ipv4/devinet.c:902: warning: label 'out' defined but not used

delete unused 'out' label and do some cleanups as well

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4d745db

net/ipv4/devinet.c

+33 −28
Original line number Diff line number Diff line
@@ -140,11 +140,11 @@ void in_dev_finish_destroy(struct in_device *idev) 
#endif

	dev_put(dev);

	if (!idev->dead)

		printk("Freeing alive in_device %p\n", idev);

	else {

		pr_err("Freeing alive in_device %p\n", idev);

	else

		kfree(idev);

}

}

EXPORT_SYMBOL(in_dev_finish_destroy);



static struct in_device *inetdev_init(struct net_device *dev)

{
@@ -159,7 +159,8 @@ static struct in_device *inetdev_init(struct net_device *dev) 
			sizeof(in_dev->cnf));

	in_dev->cnf.sysctl = NULL;

	in_dev->dev = dev;

	if ((in_dev->arp_parms = neigh_parms_alloc(dev, &arp_tbl)) == NULL)

	in_dev->arp_parms = neigh_parms_alloc(dev, &arp_tbl);

	if (!in_dev->arp_parms)

		goto out_kfree;

	if (IPV4_DEVCONF(in_dev->cnf, FORWARDING))

		dev_disable_lro(dev);
@@ -413,6 +414,7 @@ struct in_device *inetdev_by_index(struct net *net, int ifindex) 
	rcu_read_unlock();

	return in_dev;

}

EXPORT_SYMBOL(inetdev_by_index);



/* Called only from RTNL semaphored context. No locks. */
@@ -558,7 +560,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg 
 *	Determine a default network mask, based on the IP address.

 */



static __inline__ int inet_abc_len(__be32 addr)

static inline int inet_abc_len(__be32 addr)

{

	int rc = -1;	/* Something else, probably a multicast. */
@@ -647,13 +649,15 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
	rtnl_lock();



	ret = -ENODEV;

	if ((dev = __dev_get_by_name(net, ifr.ifr_name)) == NULL)

	dev = __dev_get_by_name(net, ifr.ifr_name);

	if (!dev)

		goto done;



	if (colon)

		*colon = ':';



	if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {

	in_dev = __in_dev_get_rtnl(dev);

	if (in_dev) {

		if (tryaddrmatch) {

			/* Matthias Andree */

			/* compare label and address (4.4BSD style) */
@@ -721,7 +725,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg) 


		if (!ifa) {

			ret = -ENOBUFS;

			if ((ifa = inet_alloc_ifa()) == NULL)

			ifa = inet_alloc_ifa();

			if (!ifa)

				break;

			if (colon)

				memcpy(ifa->ifa_label, ifr.ifr_name, IFNAMSIZ);
@@ -823,10 +828,10 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len) 
	struct ifreq ifr;

	int done = 0;



	if (!in_dev || (ifa = in_dev->ifa_list) == NULL)

	if (!in_dev)

		goto out;



	for (; ifa; ifa = ifa->ifa_next) {

	for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {

		if (!buf) {

			done += sizeof(ifr);

			continue;
@@ -877,16 +882,17 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) 
			addr = ifa->ifa_local;

	} endfor_ifa(in_dev);



no_in_dev:

	if (addr)

		goto out_unlock;

no_in_dev:



	/* Not loopback addresses on loopback should be preferred

	   in this case. It is importnat that lo is the first interface

	   in dev_base list.

	 */

	for_each_netdev_rcu(net, dev) {

		if ((in_dev = __in_dev_get_rcu(dev)) == NULL)

		in_dev = __in_dev_get_rcu(dev);

		if (!in_dev)

			continue;



		for_primary_ifa(in_dev) {
@@ -899,9 +905,9 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) 
	}

out_unlock:

	rcu_read_unlock();

out:

	return addr;

}

EXPORT_SYMBOL(inet_select_addr);



static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,

			      __be32 local, int scope)
@@ -960,7 +966,8 @@ __be32 inet_confirm_addr(struct in_device *in_dev, 
	net = dev_net(in_dev->dev);

	rcu_read_lock();

	for_each_netdev_rcu(net, dev) {

		if ((in_dev = __in_dev_get_rcu(dev))) {

		in_dev = __in_dev_get_rcu(dev);

		if (in_dev) {

			addr = confirm_addr_indev(in_dev, dst, local, scope);

			if (addr)

				break;
@@ -979,14 +986,16 @@ int register_inetaddr_notifier(struct notifier_block *nb) 
{

	return blocking_notifier_chain_register(&inetaddr_chain, nb);

}

EXPORT_SYMBOL(register_inetaddr_notifier);



int unregister_inetaddr_notifier(struct notifier_block *nb)

{

	return blocking_notifier_chain_unregister(&inetaddr_chain, nb);

}

EXPORT_SYMBOL(unregister_inetaddr_notifier);



/* Rename ifa_labels for a device name change. Make some effort to preserve existing

 * alias numbering and to create unique labels if possible.

/* Rename ifa_labels for a device name change. Make some effort to preserve

 * existing alias numbering and to create unique labels if possible.

*/

static void inetdev_changename(struct net_device *dev, struct in_device *in_dev)

{
@@ -1005,11 +1014,10 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) 
			sprintf(old, ":%d", named);

			dot = old;

		}

		if (strlen(dot) + strlen(dev->name) < IFNAMSIZ) {

		if (strlen(dot) + strlen(dev->name) < IFNAMSIZ)

			strcat(ifa->ifa_label, dot);

		} else {

		else

			strcpy(ifa->ifa_label + (IFNAMSIZ - strlen(dot) - 1), dot);

		}

skip:

		rtmsg_ifa(RTM_NEWADDR, ifa, NULL, 0);

	}
@@ -1056,8 +1064,9 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, 
		if (!inetdev_valid_mtu(dev->mtu))

			break;

		if (dev->flags & IFF_LOOPBACK) {

			struct in_ifaddr *ifa;

			if ((ifa = inet_alloc_ifa()) != NULL) {

			struct in_ifaddr *ifa = inet_alloc_ifa();



			if (ifa) {

				ifa->ifa_local =

				  ifa->ifa_address = htonl(INADDR_LOOPBACK);

				ifa->ifa_prefixlen = 8;
@@ -1178,7 +1187,8 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) 
			goto cont;

		if (idx > s_idx)

			s_ip_idx = 0;

		if ((in_dev = __in_dev_get_rtnl(dev)) == NULL)

		in_dev = __in_dev_get_rtnl(dev);

		if (!in_dev)

			goto cont;



		for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
@@ -1673,8 +1683,3 @@ void __init devinet_init(void) 
	rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr);

}

EXPORT_SYMBOL(in_dev_finish_destroy);

EXPORT_SYMBOL(inet_select_addr);

EXPORT_SYMBOL(inetdev_by_index);

EXPORT_SYMBOL(register_inetaddr_notifier);

EXPORT_SYMBOL(unregister_inetaddr_notifier);