From baad5d37495fe7b67b34aecf59ae43cd458ff790 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Mon, 11 Jun 2007 13:59:21 -0500 Subject: [PATCH] --- yaml --- r: 58375 b: refs/heads/master c: e1fd9070729765910b144ffcf74ca199c766509b h: refs/heads/master i: 58373: 9c952b9f014ce3fa90c7d4d519800c2d6fac3403 58371: 0d42e5007bf337e7bd716af3d21b8e26ec6df5f2 58367: a5b04528605a7cb28a2e6496f0dbd6171d63317f v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9abd012191f5..40c3daacd73f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e0a6e2598ac08d14c3388567eae9a4ccea1244f +refs/heads/master: e1fd9070729765910b144ffcf74ca199c766509b diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 628efc01f273..946b2e244f65 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1285,7 +1285,6 @@ spider_net_poll(struct net_device *netdev, int *budget) int packets_to_do, packets_done = 0; int no_more_packets = 0; - spider_net_cleanup_tx_ring(card); packets_to_do = min(*budget, netdev->quota); while (packets_to_do) { @@ -1310,6 +1309,8 @@ spider_net_poll(struct net_device *netdev, int *budget) spider_net_refill_rx_chain(card); spider_net_enable_rxdmac(card); + spider_net_cleanup_tx_ring(card); + /* if all packets are in the stack, enable interrupts and return 0 */ /* if not, return 1 */ if (no_more_packets) {