diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /net/core/netpoll.c | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 2d7d6d473781..18d9cbda3a39 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -792,6 +792,13 @@ int netpoll_setup(struct netpoll *np) | |||
| 792 | return -ENODEV; | 792 | return -ENODEV; |
| 793 | } | 793 | } |
| 794 | 794 | ||
| 795 | if (ndev->master) { | ||
| 796 | printk(KERN_ERR "%s: %s is a slave device, aborting.\n", | ||
| 797 | np->name, np->dev_name); | ||
| 798 | err = -EBUSY; | ||
| 799 | goto put; | ||
| 800 | } | ||
| 801 | |||
| 795 | if (!netif_running(ndev)) { | 802 | if (!netif_running(ndev)) { |
| 796 | unsigned long atmost, atleast; | 803 | unsigned long atmost, atleast; |
| 797 | 804 | ||