From 7dbe5b3b44852ccba61ed53359dd0cb0a49f54cb Mon Sep 17 00:00:00 2001 From: Noe Rubinstein Date: Mon, 17 Sep 2012 12:09:56 +0200 Subject: Fix UNDI without IRQ --- src/drivers/net/e1000/e1000_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/drivers/net/e1000/e1000_main.c b/src/drivers/net/e1000/e1000_main.c index a50795d4..5a954edd 100644 --- a/src/drivers/net/e1000/e1000_main.c +++ b/src/drivers/net/e1000/e1000_main.c @@ -46,6 +46,7 @@ static void e1000_irq_disable ( struct e1000_adapter *adapter ) E1000_WRITE_FLUSH ( &adapter->hw ); } +#if 0 /** * e1000_irq_enable - Enable interrupt generation * @@ -56,6 +57,7 @@ static void e1000_irq_enable ( struct e1000_adapter *adapter ) E1000_WRITE_REG(&adapter->hw, E1000_IMS, IMS_ENABLE_MASK); E1000_WRITE_FLUSH(&adapter->hw); } +#endif /** * e1000_sw_init - Initialize general software structures (struct e1000_adapter) @@ -571,7 +573,7 @@ static void e1000_close ( struct net_device *netdev ) E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN ); E1000_WRITE_FLUSH ( hw ); - e1000_reset_hw ( hw ); + e1000_reset ( adapter ); e1000_free_tx_resources ( adapter ); e1000_free_rx_resources ( adapter ); @@ -665,6 +667,7 @@ static void e1000_poll ( struct net_device *netdev ) e1000_refill_rx_ring(adapter); } +#if 0 /** * e1000_irq - enable or Disable interrupts * @@ -683,6 +686,7 @@ static void e1000_irq ( struct net_device *netdev, int enable ) e1000_irq_disable ( adapter ); } } +#endif static struct net_device_operations e1000_operations; @@ -912,5 +916,5 @@ static struct net_device_operations e1000_operations = { .close = e1000_close, .transmit = e1000_transmit, .poll = e1000_poll, - .irq = e1000_irq, + //.irq = e1000_irq, }; -- cgit v1.2.3