Commit 390fd0b3 authored Jul 12, 2011 by Matvejchikov Ilya Committed by David S. Miller Jul 13, 2011

slip: remove dead code within the slip initialization



This following code contains a dead "if (dev).." block:
        ...
        for (i = 0; i < slip_maxdev; i++) {
                dev = slip_devs[i];
                if (dev == NULL)
                        break;
        }
        /* Sorry, too many, all slots in use */
        if (i >= slip_maxdev)
                return NULL;

        if (dev) {
                sl = netdev_priv(dev);
                if (test_bit(SLF_INUSE, &sl->flags)) {
                        unregister_netdevice(dev);
                        dev = NULL;
                        slip_devs[i] = NULL;
                }
         }
        ...
The reason is that the code starting with "if (dev).." is never called as
when we found an empty slot (dev == NULL) we break the loop and "if (dev).."
not works eiter the loop ends and we get out with "i >= slip_maxdev".

Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9173a88f

drivers/net/slip.c

+6 −18

Original line number	Diff line number	Diff line
		@@ -723,6 +723,7 @@ static void sl_sync(void)
		static struct slip *sl_alloc(dev_t line)
		{
		int i;
		char name[IFNAMSIZ];
		struct net_device *dev = NULL;
		struct slip *sl;

		@@ -735,25 +736,12 @@ static struct slip *sl_alloc(dev_t line)
		if (i >= slip_maxdev)
		return NULL;

		if (dev) {
		sl = netdev_priv(dev);
		if (test_bit(SLF_INUSE, &sl->flags)) {
		unregister_netdevice(dev);
		dev = NULL;
		slip_devs[i] = NULL;
		}
		}

		if (!dev) {
		char name[IFNAMSIZ];
		sprintf(name, "sl%d", i);

		dev = alloc_netdev(sizeof(*sl), name, sl_setup);
		if (!dev)
		return NULL;
		dev->base_addr = i;
		}

		dev->base_addr = i;
		sl = netdev_priv(dev);

		/* Initialize channel control data */