Commit 990c3d6f authored Oct 13, 2010 by Neil Horman Committed by David S. Miller Oct 18, 2010

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>

parent e843fa50

net/core/netpoll.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message