Commit 650b5a5c authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

e1000: drop redunant line of code, cleanup 



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

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d6114e7

drivers/net/e1000/e1000_main.c

+4 −8
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE