OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000: drop redunant line of code, cleanup 

adapter was being assigned twice, also clarified variable name and unwrapped
line.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jesse Brandeburg 2009-09-25 12:19:23 +00:00 committed by David S. Miller
parent 3d6114e71d
commit 650b5a5cc3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/e1000/e1000_main.c
View File

@ -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 */