diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000.h linux-2.5.25-e1000/drivers/net/e1000/e1000.h --- linux-2.5.25/drivers/net/e1000/e1000.h Sun Jul 7 13:38:56 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000.h Sat Jul 6 10:55:22 2002 @@ -109,9 +109,7 @@ #include #include #include -#ifdef NETIF_F_HW_VLAN_TX #include -#endif #define BAR_0 0 #define BAR_1 1 @@ -199,9 +197,7 @@ struct e1000_adapter { #ifdef CONFIG_PROC_FS struct list_head proc_list_head; #endif -#ifdef NETIF_F_HW_VLAN_TX struct vlan_group *vlgrp; -#endif char *id_string; uint32_t bd_number; uint32_t rx_buffer_len; @@ -212,10 +208,8 @@ struct e1000_adapter { spinlock_t stats_lock; atomic_t irq_sem; -#ifdef ETHTOOL_PHYS_ID struct timer_list blink_timer; unsigned long led_status; -#endif /* TX */ struct e1000_desc_ring tx_ring; diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000_ethtool.c linux-2.5.25-e1000/drivers/net/e1000/e1000_ethtool.c --- linux-2.5.25/drivers/net/e1000/e1000_ethtool.c Sun Jul 7 13:38:56 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000_ethtool.c Sat Jul 6 10:55:22 2002 @@ -412,7 +412,6 @@ e1000_ethtool_swol(struct e1000_adapter return 0; } -#ifdef ETHTOOL_PHYS_ID /* toggle LED 4 times per second = 2 "blinks" per second */ #define E1000_ID_INTERVAL (HZ/4) @@ -458,7 +457,6 @@ e1000_ethtool_led_blink(struct e1000_ada return 0; } -#endif /* ETHTOOL_PHYS_ID */ int e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr) @@ -516,14 +514,12 @@ e1000_ethtool_ioctl(struct net_device *n e1000_up(adapter); return 0; } -#ifdef ETHTOOL_PHYS_ID case ETHTOOL_PHYS_ID: { struct ethtool_value id; if(copy_from_user(&id, addr, sizeof(id))) return -EFAULT; return e1000_ethtool_led_blink(adapter, &id); } -#endif /* ETHTOOL_PHYS_ID */ case ETHTOOL_GLINK: { struct ethtool_value link = {ETHTOOL_GLINK}; link.data = netif_carrier_ok(netdev); diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000_hw.c linux-2.5.25-e1000/drivers/net/e1000/e1000_hw.c --- linux-2.5.25/drivers/net/e1000/e1000_hw.c Sun Jul 7 13:38:56 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000_hw.c Sun Jul 7 12:16:59 2002 @@ -107,17 +107,13 @@ e1000_reset_hw(struct e1000_hw *hw) uint32_t ctrl_ext; uint32_t icr; uint32_t manc; - uint16_t pci_cmd_word; DEBUGFUNC("e1000_reset_hw"); /* For 82542 (rev 2.0), disable MWI before issuing a device reset */ if(hw->mac_type == e1000_82542_rev2_0) { - if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE) { - DEBUGOUT("Disabling MWI on 82542 rev 2.0\n"); - pci_cmd_word = hw->pci_cmd_word & ~CMD_MEM_WRT_INVALIDATE; - e1000_write_pci_cfg(hw, PCI_COMMAND_REGISTER, &pci_cmd_word); - } + DEBUGOUT("Disabling MWI on 82542 rev 2.0\n"); + e1000_pci_clear_mwi(hw); } /* Clear interrupt mask to stop board from generating interrupts */ @@ -130,6 +126,7 @@ e1000_reset_hw(struct e1000_hw *hw) */ E1000_WRITE_REG(hw, RCTL, 0); E1000_WRITE_REG(hw, TCTL, E1000_TCTL_PSP); + E1000_WRITE_FLUSH(hw); /* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */ hw->tbi_compatibility_on = FALSE; @@ -159,6 +156,7 @@ e1000_reset_hw(struct e1000_hw *hw) ctrl_ext = E1000_READ_REG(hw, CTRL_EXT); ctrl_ext |= E1000_CTRL_EXT_EE_RST; E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext); + E1000_WRITE_FLUSH(hw); /* Wait for EEPROM reload */ msec_delay(2); } else { @@ -180,7 +178,7 @@ e1000_reset_hw(struct e1000_hw *hw) /* If MWI was previously enabled, reenable it. */ if(hw->mac_type == e1000_82542_rev2_0) { if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE) - e1000_write_pci_cfg(hw, PCI_COMMAND_REGISTER, &hw->pci_cmd_word); + e1000_pci_set_mwi(hw); } } @@ -201,7 +199,6 @@ e1000_init_hw(struct e1000_hw *hw) uint32_t ctrl, status; uint32_t i; int32_t ret_val; - uint16_t pci_cmd_word; uint16_t pcix_cmd_word; uint16_t pcix_stat_hi_word; uint16_t cmd_mmrbc; @@ -244,12 +241,10 @@ e1000_init_hw(struct e1000_hw *hw) /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */ if(hw->mac_type == e1000_82542_rev2_0) { - if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE) { - DEBUGOUT("Disabling MWI on 82542 rev 2.0\n"); - pci_cmd_word = hw->pci_cmd_word & ~CMD_MEM_WRT_INVALIDATE; - e1000_write_pci_cfg(hw, PCI_COMMAND_REGISTER, &pci_cmd_word); - } + DEBUGOUT("Disabling MWI on 82542 rev 2.0\n"); + e1000_pci_clear_mwi(hw); E1000_WRITE_REG(hw, RCTL, E1000_RCTL_RST); + E1000_WRITE_FLUSH(hw); msec_delay(5); } @@ -261,9 +256,10 @@ e1000_init_hw(struct e1000_hw *hw) /* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */ if(hw->mac_type == e1000_82542_rev2_0) { E1000_WRITE_REG(hw, RCTL, 0); + E1000_WRITE_FLUSH(hw); msec_delay(1); if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE) - e1000_write_pci_cfg(hw, PCI_COMMAND_REGISTER, &hw->pci_cmd_word); + e1000_pci_set_mwi(hw); } /* Zero out the Multicast HASH table */ @@ -509,6 +505,7 @@ e1000_setup_fiber_link(struct e1000_hw * E1000_WRITE_REG(hw, TXCW, txcw); E1000_WRITE_REG(hw, CTRL, ctrl); + E1000_WRITE_FLUSH(hw); hw->txcw = txcw; msec_delay(1); @@ -1122,6 +1119,7 @@ e1000_config_collision_dist(struct e1000 tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT; E1000_WRITE_REG(hw, TCTL, tctl); + E1000_WRITE_FLUSH(hw); } /****************************************************************************** @@ -1719,6 +1717,7 @@ e1000_raise_mdi_clk(struct e1000_hw *hw, * bit), and then delay 2 microseconds. */ E1000_WRITE_REG(hw, CTRL, (*ctrl | E1000_CTRL_MDC)); + E1000_WRITE_FLUSH(hw); usec_delay(2); } @@ -1736,6 +1735,7 @@ e1000_lower_mdi_clk(struct e1000_hw *hw, * bit), and then delay 2 microseconds. */ E1000_WRITE_REG(hw, CTRL, (*ctrl & ~E1000_CTRL_MDC)); + E1000_WRITE_FLUSH(hw); usec_delay(2); } @@ -1778,6 +1778,7 @@ e1000_shift_out_mdi_bits(struct e1000_hw else ctrl &= ~E1000_CTRL_MDIO; E1000_WRITE_REG(hw, CTRL, ctrl); + E1000_WRITE_FLUSH(hw); usec_delay(2); @@ -1786,9 +1787,6 @@ e1000_shift_out_mdi_bits(struct e1000_hw mask = mask >> 1; } - - /* Clear the data bit just before leaving this routine. */ - ctrl &= ~E1000_CTRL_MDIO; } /****************************************************************************** @@ -1819,6 +1817,7 @@ e1000_shift_in_mdi_bits(struct e1000_hw ctrl &= ~E1000_CTRL_MDIO; E1000_WRITE_REG(hw, CTRL, ctrl); + E1000_WRITE_FLUSH(hw); /* Raise and Lower the clock before reading in the data. This accounts for * the turnaround bits. The first clock occurred when we clocked out the @@ -1839,9 +1838,6 @@ e1000_shift_in_mdi_bits(struct e1000_hw e1000_raise_mdi_clk(hw, &ctrl); e1000_lower_mdi_clk(hw, &ctrl); - /* Clear the MDIO bit just before leaving this routine. */ - ctrl &= ~E1000_CTRL_MDIO; - return data; } @@ -2015,8 +2011,10 @@ e1000_phy_hw_reset(struct e1000_hw *hw) */ ctrl = E1000_READ_REG(hw, CTRL); E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PHY_RST); + E1000_WRITE_FLUSH(hw); msec_delay(10); E1000_WRITE_REG(hw, CTRL, ctrl); + E1000_WRITE_FLUSH(hw); } else { /* Read the Extended Device Control Register, assert the PHY_RESET_DIR * bit to put the PHY into reset. Then, take it out of reset. @@ -2025,9 +2023,11 @@ e1000_phy_hw_reset(struct e1000_hw *hw) ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR; ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA; E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext); + E1000_WRITE_FLUSH(hw); msec_delay(10); ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA; E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext); + E1000_WRITE_FLUSH(hw); } usec_delay(150); } @@ -2230,6 +2230,7 @@ e1000_raise_ee_clk(struct e1000_hw *hw, */ *eecd = *eecd | E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, *eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); } @@ -2248,6 +2249,7 @@ e1000_lower_ee_clk(struct e1000_hw *hw, */ *eecd = *eecd & ~E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, *eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); } @@ -2285,6 +2287,7 @@ e1000_shift_out_ee_bits(struct e1000_hw eecd |= E1000_EECD_DI; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); @@ -2379,21 +2382,25 @@ e1000_standby_eeprom(struct e1000_hw *hw /* Deselct EEPROM */ eecd &= ~(E1000_EECD_CS | E1000_EECD_SK); E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); /* Clock high */ eecd |= E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); /* Select EEPROM */ eecd |= E1000_EECD_CS; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); /* Clock low */ eecd &= ~E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); } @@ -2412,11 +2419,13 @@ e1000_clock_eeprom(struct e1000_hw *hw) /* Rising edge of clock */ eecd |= E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); /* Falling edge of clock */ eecd &= ~E1000_EECD_SK; E1000_WRITE_REG(hw, EECD, eecd); + E1000_WRITE_FLUSH(hw); usec_delay(50); } diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000_hw.h linux-2.5.25-e1000/drivers/net/e1000/e1000_hw.h --- linux-2.5.25/drivers/net/e1000/e1000_hw.h Sun Jul 7 13:38:56 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000_hw.h Sat Jul 6 10:55:22 2002 @@ -264,6 +264,8 @@ void e1000_reset_adaptive(struct e1000_h void e1000_update_adaptive(struct e1000_hw *hw); void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, uint32_t frame_len, uint8_t * mac_addr); void e1000_get_bus_info(struct e1000_hw *hw); +void e1000_pci_set_mwi(struct e1000_hw *hw); +void e1000_pci_clear_mwi(struct e1000_hw *hw); void e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value); void e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value); /* Port I/O is only supported on 82544 and newer */ diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000_main.c linux-2.5.25-e1000/drivers/net/e1000/e1000_main.c --- linux-2.5.25/drivers/net/e1000/e1000_main.c Sun Jul 7 13:38:56 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000_main.c Sat Jul 6 10:55:22 2002 @@ -196,11 +196,9 @@ static inline void e1000_rx_checksum(str struct sk_buff *skb); static void e1000_tx_timeout(struct net_device *dev); -#ifdef NETIF_F_HW_VLAN_TX static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp); static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid); static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid); -#endif static int e1000_notify_reboot(struct notifier_block *, unsigned long event, void *ptr); static int e1000_suspend(struct pci_dev *pdev, uint32_t state); @@ -422,11 +420,9 @@ e1000_probe(struct pci_dev *pdev, netdev->do_ioctl = &e1000_ioctl; netdev->tx_timeout = &e1000_tx_timeout; netdev->watchdog_timeo = HZ; -#ifdef NETIF_F_HW_VLAN_TX netdev->vlan_rx_register = e1000_vlan_rx_register; netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid; netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid; -#endif netdev->irq = pdev->irq; netdev->mem_start = mmio_start; @@ -440,15 +436,11 @@ e1000_probe(struct pci_dev *pdev, e1000_sw_init(adapter); if(adapter->hw.mac_type >= e1000_82543) { -#ifdef NETIF_F_HW_VLAN_TX netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; -#else - netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM; -#endif } else { netdev->features = NETIF_F_SG; } @@ -582,18 +574,12 @@ e1000_sw_init(struct e1000_adapter *adap /* PCI config space info */ - uint16_t *vendor = &hw->vendor_id; - uint16_t *device = &hw->device_id; - uint16_t *subvendor = &hw->subsystem_vendor_id; - uint16_t *subsystem = &hw->subsystem_id; - uint8_t *revision = &hw->revision_id; - - pci_read_config_word(pdev, PCI_VENDOR_ID, vendor); - pci_read_config_word(pdev, PCI_DEVICE_ID, device); - pci_read_config_byte(pdev, PCI_REVISION_ID, revision); - pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, subvendor); - pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, subsystem); - + pci_read_config_word(pdev, PCI_VENDOR_ID, &hw->vendor_id); + pci_read_config_word(pdev, PCI_DEVICE_ID, &hw->device_id); + pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, + &hw->subsystem_vendor_id); + pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &hw->subsystem_id); + pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id); pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word); adapter->rx_buffer_len = E1000_RXBUFFER_2048; @@ -603,9 +589,9 @@ e1000_sw_init(struct e1000_adapter *adap /* identify the MAC */ - switch (*device) { + switch (hw->device_id) { case E1000_DEV_ID_82542: - switch (*revision) { + switch (hw->revision_id) { case E1000_82542_2_0_REV_ID: hw->mac_type = e1000_82542_rev2_0; break; @@ -639,7 +625,7 @@ e1000_sw_init(struct e1000_adapter *adap hw->mac_type = e1000_82546; break; default: - /* should never have loaded on this device */ + E1000_ERR("Should never have loaded on this device\n"); BUG(); } @@ -1138,20 +1124,16 @@ e1000_clean_rx_ring(struct e1000_adapter static void e1000_enter_82542_rst(struct e1000_adapter *adapter) { - struct pci_dev *pdev = adapter->pdev; struct net_device *netdev = adapter->netdev; - uint16_t pci_command_word = adapter->hw.pci_cmd_word; uint32_t rctl; - if(pci_command_word & PCI_COMMAND_INVALIDATE) { - pci_command_word &= ~PCI_COMMAND_INVALIDATE; - pci_write_config_word(pdev, PCI_COMMAND, pci_command_word); - } + e1000_pci_clear_mwi(&adapter->hw); rctl = E1000_READ_REG(&adapter->hw, RCTL); rctl |= E1000_RCTL_RST; E1000_WRITE_REG(&adapter->hw, RCTL, rctl); - msec_delay(5); + E1000_WRITE_FLUSH(&adapter->hw); + mdelay(5); if(netif_running(netdev)) e1000_clean_rx_ring(adapter); @@ -1160,18 +1142,17 @@ e1000_enter_82542_rst(struct e1000_adapt static void e1000_leave_82542_rst(struct e1000_adapter *adapter) { - struct pci_dev *pdev = adapter->pdev; struct net_device *netdev = adapter->netdev; - uint16_t pci_command_word = adapter->hw.pci_cmd_word; uint32_t rctl; rctl = E1000_READ_REG(&adapter->hw, RCTL); rctl &= ~E1000_RCTL_RST; E1000_WRITE_REG(&adapter->hw, RCTL, rctl); - msec_delay(5); + E1000_WRITE_FLUSH(&adapter->hw); + mdelay(5); - if(pci_command_word & PCI_COMMAND_INVALIDATE) - pci_write_config_word(pdev, PCI_COMMAND, pci_command_word); + if(adapter->hw.pci_cmd_word & PCI_COMMAND_INVALIDATE) + e1000_pci_set_mwi(&adapter->hw); if(netif_running(netdev)) { e1000_configure_rx(adapter); @@ -1478,6 +1459,7 @@ e1000_tx_queue(struct e1000_adapter *ada tx_ring->next_to_use = i; E1000_WRITE_REG(&adapter->hw, TDT, i); + E1000_WRITE_FLUSH(&adapter->hw); } #define TXD_USE_COUNT(S, X) (((S) / (X)) + (((S) % (X)) ? 1 : 0)) @@ -1507,12 +1489,10 @@ e1000_xmit_frame(struct sk_buff *skb, st if(e1000_tx_csum(adapter, skb)) tx_flags |= E1000_TX_FLAGS_CSUM; -#ifdef NETIF_F_HW_VLAN_TX if(adapter->vlgrp && vlan_tx_tag_present(skb)) { tx_flags |= E1000_TX_FLAGS_VLAN; tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT); } -#endif count = e1000_tx_map(adapter, skb); @@ -1748,6 +1728,7 @@ e1000_irq_disable(struct e1000_adapter * { atomic_inc(&adapter->irq_sem); E1000_WRITE_REG(&adapter->hw, IMC, ~0); + E1000_WRITE_FLUSH(&adapter->hw); synchronize_irq(); } @@ -1759,8 +1740,10 @@ e1000_irq_disable(struct e1000_adapter * static inline void e1000_irq_enable(struct e1000_adapter *adapter) { - if(atomic_dec_and_test(&adapter->irq_sem)) + if(atomic_dec_and_test(&adapter->irq_sem)) { E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK); + E1000_WRITE_FLUSH(&adapter->hw); + } } /** @@ -1828,8 +1811,7 @@ e1000_clean_tx_irq(struct e1000_adapter tx_ring->buffer_info[i].skb = NULL; } - memset(tx_desc, 0, sizeof(struct e1000_tx_desc)); - mb(); + tx_desc->upper.data = 0; i = (i + 1) % tx_ring->count; tx_desc = E1000_TX_DESC(*tx_ring, i); @@ -1882,8 +1864,7 @@ e1000_clean_rx_irq(struct e1000_adapter E1000_DBG("Receive packet consumed multiple buffers\n"); dev_kfree_skb_irq(skb); - memset(rx_desc, 0, sizeof(struct e1000_rx_desc)); - mb(); + rx_desc->status = 0; rx_ring->buffer_info[i].skb = NULL; i = (i + 1) % rx_ring->count; @@ -1911,8 +1892,7 @@ e1000_clean_rx_irq(struct e1000_adapter } else { dev_kfree_skb_irq(skb); - memset(rx_desc, 0, sizeof(struct e1000_rx_desc)); - mb(); + rx_desc->status = 0; rx_ring->buffer_info[i].skb = NULL; i = (i + 1) % rx_ring->count; @@ -1929,20 +1909,15 @@ e1000_clean_rx_irq(struct e1000_adapter e1000_rx_checksum(adapter, rx_desc, skb); skb->protocol = eth_type_trans(skb, netdev); -#ifdef NETIF_F_HW_VLAN_TX if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) { vlan_hwaccel_rx(skb, adapter->vlgrp, (rx_desc->special & E1000_RXD_SPC_VLAN_MASK)); } else { netif_rx(skb); } -#else - netif_rx(skb); -#endif netdev->last_rx = jiffies; - memset(rx_desc, 0, sizeof(struct e1000_rx_desc)); - mb(); + rx_desc->status = 0; rx_ring->buffer_info[i].skb = NULL; i = (i + 1) % rx_ring->count; @@ -2067,6 +2042,22 @@ e1000_rx_checksum(struct e1000_adapter * } void +e1000_pci_set_mwi(struct e1000_hw *hw) +{ + struct e1000_adapter *adapter = hw->back; + + pci_set_mwi(adapter->pdev); +} + +void +e1000_pci_clear_mwi(struct e1000_hw *hw) +{ + struct e1000_adapter *adapter = hw->back; + + pci_clear_mwi(adapter->pdev); +} + +void e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value) { struct e1000_adapter *adapter = hw->back; @@ -2094,7 +2085,6 @@ e1000_io_write(struct e1000_hw *hw, uint outl(value, port); } -#ifdef NETIF_F_HW_VLAN_TX static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) { @@ -2170,7 +2160,6 @@ e1000_vlan_rx_kill_vid(struct net_device vfta &= ~(1 << (vid & 0x1F)); e1000_write_vfta(&adapter->hw, index, vfta); } -#endif static int e1000_notify_reboot(struct notifier_block *nb, unsigned long event, void *p) diff -Nuarp linux-2.5.25/drivers/net/e1000/e1000_osdep.h linux-2.5.25-e1000/drivers/net/e1000/e1000_osdep.h --- linux-2.5.25/drivers/net/e1000/e1000_osdep.h Fri Jul 5 16:42:18 2002 +++ linux-2.5.25-e1000/drivers/net/e1000/e1000_osdep.h Sat Jul 6 10:55:22 2002 @@ -88,7 +88,8 @@ #define usec_delay(x) udelay(x) #ifndef msec_delay #define msec_delay(x) do { if(in_interrupt()) { \ - mdelay(x); \ + /* Don't mdelay in interrupt context! */ \ + BUG(); \ } else { \ set_current_state(TASK_UNINTERRUPTIBLE); \ schedule_timeout((x * HZ)/1000); \ @@ -139,5 +140,7 @@ typedef enum { ((a)->mac_type >= e1000_82543) ? \ readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) : \ readl((a)->hw_addr + E1000_82542_##reg + ((offset) << 2))) + +#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS); #endif /* _E1000_OSDEP_H_ */