Pārlūkot izejas kodu

netpoll: prevent netpoll setup on slave devices

In commit 8d8fc29d02a33e4bd5f4fa47823c1fd386346093
(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>
WANG Cong 14 gadi atpakaļ
vecāks
revīzija
0c1ad04aec
1 mainītis faili ar 6 papildinājumiem un 0 dzēšanām
  1. 6 0
      net/core/netpoll.c

+ 6 - 0
net/core/netpoll.c

@@ -792,6 +792,12 @@ int netpoll_setup(struct netpoll *np)
 		return -ENODEV;
 		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)) {
 	if (!netif_running(ndev)) {
 		unsigned long atmost, atleast;
 		unsigned long atmost, atleast;