dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

e1000: fix warnings

Browse source
This commit is contained in:
Jeff Garzik 2005-10-04 07:13:43 -04:00
parent a7990ba60a
commit be2b28ed3b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/e1000/e1000_main.c
View file

@ -777,12 +777,12 @@ e1000_remove(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
uint32_t ctrl_ext; uint32_t ctrl_ext;
uint32_t manc, swsm; uint32_t manc, swsm;
flush_scheduled_work();
#ifdef CONFIG_E1000_NAPI #ifdef CONFIG_E1000_NAPI
int i; int i;
#endif #endif
flush_scheduled_work();
if(adapter->hw.mac_type >= e1000_82540 && if(adapter->hw.mac_type >= e1000_82540 &&
adapter->hw.media_type == e1000_media_type_copper) { adapter->hw.media_type == e1000_media_type_copper) {
manc = E1000_READ_REG(&adapter->hw, MANC); manc = E1000_READ_REG(&adapter->hw, MANC);
@ -3100,7 +3100,9 @@ e1000_intr(int irq, void *data, struct pt_regs *regs)
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
uint32_t icr = E1000_READ_REG(hw, ICR); uint32_t icr = E1000_READ_REG(hw, ICR);
#ifdef CONFIG_E1000_MQ
int i; int i;
#endif
if(unlikely(!icr)) if(unlikely(!icr))
return IRQ_NONE; /* Not our interrupt */ return IRQ_NONE; /* Not our interrupt */
@ -3128,13 +3130,14 @@ e1000_intr(int irq, void *data, struct pt_regs *regs)
} else { } else {
printk("call_data.count == %u\n", atomic_read(&adapter->rx_sched_call_data.count)); printk("call_data.count == %u\n", atomic_read(&adapter->rx_sched_call_data.count));
} }
#else #else /* if !CONFIG_E1000_MQ */
if (likely(netif_rx_schedule_prep(&adapter->polling_netdev[0]))) if (likely(netif_rx_schedule_prep(&adapter->polling_netdev[0])))
__netif_rx_schedule(&adapter->polling_netdev[0]); __netif_rx_schedule(&adapter->polling_netdev[0]);
else else
e1000_irq_enable(adapter); e1000_irq_enable(adapter);
#endif #endif /* CONFIG_E1000_MQ */
#else
#else /* if !CONFIG_E1000_NAPI */
/* Writing IMC and IMS is needed for 82547. /* Writing IMC and IMS is needed for 82547.
Due to Hub Link bus being occupied, an interrupt Due to Hub Link bus being occupied, an interrupt
de-assertion message is not able to be sent. de-assertion message is not able to be sent.
@ -3158,7 +3161,7 @@ e1000_intr(int irq, void *data, struct pt_regs *regs)
if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
e1000_irq_enable(adapter); e1000_irq_enable(adapter);
#endif #endif /* CONFIG_E1000_NAPI */
return IRQ_HANDLED; return IRQ_HANDLED;
} }