(sorry for munging the subject of the prior two patches)
The poll_napi routine is not specific to a netpoll. It really should be
able to be called with a struct net_device. Changing the routine to take a
struct net_device makes it easier to support the bonding driver, since we
will be implementing a netpoll_poll_dev routine, that will not have a
struct netpoll associated with it.
Signed-off-by: Jeff Moyer <[email protected]>
---
--- linux-2.6.12/net/core/netpoll.c.orig 2005-07-01 14:12:33.986337259 -0400
+++ linux-2.6.12/net/core/netpoll.c 2005-07-01 14:20:45.848186887 -0400
@@ -128,10 +128,9 @@ static int checksum_udp(struct sk_buff *
* network adapter, forcing superfluous retries and possibly timeouts.
* Thus, we set our budget to greater than 1.
*/
-static void poll_napi(struct netpoll *np)
+static void poll_napi(struct net_device *dev)
{
- struct netpoll_info *npinfo = np->dev->npinfo;
- struct net_device *dev = np->dev;
+ struct netpoll_info *npinfo = dev->npinfo;
int budget = 16;
if (test_bit(__LINK_STATE_RX_SCHED, &dev->state) &&
@@ -156,7 +155,7 @@ void netpoll_poll(struct netpoll *np)
/* Process pending work on NIC */
np->dev->poll_controller(np->dev);
if (np->dev->poll)
- poll_napi(np);
+ poll_napi(np->dev);
zap_completion_queue();
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |