Commit 0c1ad04a authored Jun 09, 2011 by WANG Cong Committed by David S. Miller Jun 09, 2011

netpoll: prevent netpoll setup on slave devices



In commit 8d8fc29d
(netpoll: disable netpoll when enslave a device), we automatically
disable netpoll when the underlying device is being enslaved,
we also need to prevent people from setuping netpoll on
devices that are already enslaved.

Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fe6fe792

net/core/netpoll.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -792,6 +792,12 @@ int netpoll_setup(struct netpoll *np)
		return -ENODEV;
		}

		if (ndev->master) {
		printk(KERN_ERR "%s: %s is a slave device, aborting.\n",
		np->name, np->dev_name);
		return -EBUSY;
		}

		if (!netif_running(ndev)) {
		unsigned long atmost, atleast;