git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netpoll: prevent netpoll setup on slave devices
[sfrench/cifs-2.6.git]
/
net
/
core
/
netpoll.c
diff --git
a/net/core/netpoll.c
b/net/core/netpoll.c
index 2d7d6d4737810c0bd9d0b93defbf2c972f1c6b2e..42ea4b0e59f1d3a780d57e9836181f055cb2c006 100644
(file)
--- a/
net/core/netpoll.c
+++ b/
net/core/netpoll.c
@@
-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;