From c212652cd60b1c4ed1c536ad8043c1beac434434 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Fri, 25 Sep 2009 12:19:23 +0000 Subject: [PATCH] --- yaml --- r: 166551 b: refs/heads/master c: 650b5a5cc34b9fbd38b68e9b8bb1455222fcdb87 h: refs/heads/master i: 166549: 69e1c7451df45eb46e0772ca5b49ff3fa000c31b 166547: 3995dc0ef629158cc29ad7f57a2c5a60d53d508a 166543: 78ed5ccfbffb5e654ddb1bb31e25a8734ea406be v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2d26bf35c164..2085c724c66d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d6114e71dffb9fb9dedc8569103310c5bbf0296 +refs/heads/master: 650b5a5cc34b9fbd38b68e9b8bb1455222fcdb87 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 2178e0d39c01..d7dea6946e85 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -3394,17 +3394,13 @@ static irqreturn_t e1000_intr(int irq, void *data) static int e1000_clean(struct napi_struct *napi, int budget) { struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); - struct net_device *poll_dev = adapter->netdev; - int tx_cleaned = 0, work_done = 0; + int tx_clean_complete = 0, work_done = 0; - adapter = netdev_priv(poll_dev); + tx_clean_complete = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]); - tx_cleaned = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]); + adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget); - adapter->clean_rx(adapter, &adapter->rx_ring[0], - &work_done, budget); - - if (!tx_cleaned) + if (!tx_clean_complete) work_done = budget; /* If budget not fully consumed, exit the polling mode */