diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2010-10-13 16:01:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-18 08:32:08 -0700 |
| commit | 990c3d6f9c4115347659fc2b163907c8c832ae44 (patch) | |
| tree | d41e68a1c3c34d8439fe886b96c18fec4d954604 | |
| parent | e843fa50887582c867d8b7995f81fe9c1a076806 (diff) | |
| download | linux-990c3d6f9c4115347659fc2b163907c8c832ae44.tar.gz | |
bonding: Fix napi poll for bonding driver
Usually the netpoll path, when preforming a napi poll can get away with just polling all the napi instances of the configured device. Thats not the case for the bonding driver however, as the napi instances which may wind up getting flagged as needing polling after the poll_controller call don't belong to the bonded device, but rather to the slave devices. Fix this by checking the device in question for the IFF_MASTER flag, if set, we know we need to check the full poll list for this cpu, rather than just the devices napi instance list. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/netpoll.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 4e98ffac3af0..d79d221fd1f4 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); |