equal
deleted
inserted
replaced
2400 |
2400 |
2401 if (!adapter->netdev && netif_running(netdev)) { |
2401 if (!adapter->netdev && netif_running(netdev)) { |
2402 /* No need to loop, because 82542 supports only 1 queue */ |
2402 /* No need to loop, because 82542 supports only 1 queue */ |
2403 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2403 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2404 e1000_configure_rx(adapter); |
2404 e1000_configure_rx(adapter); |
2405 if (adapter->ecdev) { |
2405 if (adapter->ecdev) { |
2406 /* fill rx ring completely! */ |
2406 /* fill rx ring completely! */ |
2407 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2407 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2408 } else { |
2408 } else { |
2409 /* this one leaves the last ring element unallocated! */ |
2409 /* this one leaves the last ring element unallocated! */ |
2410 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
2410 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
3847 { |
3847 { |
3848 struct net_device *netdev = data; |
3848 struct net_device *netdev = data; |
3849 struct e1000_adapter *adapter = netdev_priv(netdev); |
3849 struct e1000_adapter *adapter = netdev_priv(netdev); |
3850 struct e1000_hw *hw = &adapter->hw; |
3850 struct e1000_hw *hw = &adapter->hw; |
3851 int i; |
3851 int i; |
3852 |
3852 |
3853 if (adapter->ecdev) { |
3853 if (adapter->ecdev) { |
3854 #ifdef CONFIG_E1000_NAPI |
3854 #ifdef CONFIG_E1000_NAPI |
3855 int ec_work_done = 0; |
3855 int ec_work_done = 0; |
3856 #endif |
3856 #endif |
3857 for (i = 0; i < E1000_MAX_INTR; i++) |
3857 for (i = 0; i < E1000_MAX_INTR; i++) |
4011 */ |
4011 */ |
4012 if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) { |
4012 if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) { |
4013 atomic_inc(&adapter->irq_sem); |
4013 atomic_inc(&adapter->irq_sem); |
4014 E1000_WRITE_REG(hw, IMC, ~0); |
4014 E1000_WRITE_REG(hw, IMC, ~0); |
4015 } |
4015 } |
4016 |
4016 |
4017 adapter->total_tx_bytes = 0; |
4017 adapter->total_tx_bytes = 0; |
4018 adapter->total_rx_bytes = 0; |
4018 adapter->total_rx_bytes = 0; |
4019 adapter->total_tx_packets = 0; |
4019 adapter->total_tx_packets = 0; |
4020 adapter->total_rx_packets = 0; |
4020 adapter->total_rx_packets = 0; |
4021 |
4021 |