]> bbs.cooldavid.org Git - net-next-2.6.git/commit
netpoll: Revert napi_poll fix for bonding driver
authorNeil Horman <nhorman@tuxdriver.com>
Tue, 19 Oct 2010 07:04:26 +0000 (07:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Oct 2010 08:44:30 +0000 (01:44 -0700)
commitf13d493d9cf772d510d78ae00bb9f4d680b3170b
treeaec4db35f4d2cd2328179e6a4fde6bf5017d3a0d
parent9ff76c951c5194d44a7cdce51d807d67fc3ae514
netpoll: Revert napi_poll fix for bonding driver

In an erlier patch I modified napi_poll so that devices with IFF_MASTER polled
the per_cpu list instead of the device list for napi.  I did this because the
bonding driver has no napi instances to poll, it instead expects to check the
slave devices napi instances, which napi_poll was unaware of.  Looking at this
more closely however, I now see this isn't strictly needed.  As the bond driver
poll_controller calls the slaves poll_controller via netpoll_poll_dev, which
recursively calls poll_napi on each slave, allowing those napi instances to get
serviced.  The earlier patch isn't at all harmfull, its just not needed, so lets
revert it to make the code cleaner.  Sorry for the noise,

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Reviewed-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/netpoll.c