1 files changed, 6 insertions, 0 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 2d7d6d47378..42ea4b0e59f 100644
--- 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;