1 files changed, 8 insertions, 1 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4e98ffac3af..d79d221fd1f 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -156,8 +156,15 @@ static void poll_napi(struct net_device *dev)
 {
         struct napi_struct *napi;
         int budget = 16;
+        struct softnet_data *sd = &__get_cpu_var(softnet_data);
+        struct list_head *nlist;
 
-        list_for_each_entry(napi, &dev->napi_list, dev_list) {
+        if (dev->flags & IFF_MASTER)
+                nlist = &sd->poll_list;
+        else
+                nlist = &dev->napi_list;
+
+        list_for_each_entry(napi, nlist, dev_list) {
                 if (napi->poll_owner != smp_processor_id() &&
                     spin_trylock(&napi->poll_lock)) {
                         budget = poll_one_napi(dev->npinfo, napi, budget);