equal
deleted
inserted
replaced
267 int irq_flags = IRQF_SHARED; |
267 int irq_flags = IRQF_SHARED; |
268 int err; |
268 int err; |
269 |
269 |
270 if (adapter->ecdev) |
270 if (adapter->ecdev) |
271 return 0; |
271 return 0; |
272 |
272 |
273 if (hw->mac_type >= e1000_82571) { |
273 if (hw->mac_type >= e1000_82571) { |
274 adapter->have_msi = !pci_enable_msi(adapter->pdev); |
274 adapter->have_msi = !pci_enable_msi(adapter->pdev); |
275 if (adapter->have_msi) { |
275 if (adapter->have_msi) { |
276 handler = e1000_intr_msi; |
276 handler = e1000_intr_msi; |
277 irq_flags = 0; |
277 irq_flags = 0; |
329 { |
329 { |
330 struct e1000_hw *hw = &adapter->hw; |
330 struct e1000_hw *hw = &adapter->hw; |
331 |
331 |
332 if (adapter->ecdev) |
332 if (adapter->ecdev) |
333 return; |
333 return; |
334 |
334 |
335 ew32(IMS, IMS_ENABLE_MASK); |
335 ew32(IMS, IMS_ENABLE_MASK); |
336 E1000_WRITE_FLUSH(); |
336 E1000_WRITE_FLUSH(); |
337 } |
337 } |
338 |
338 |
339 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
339 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
2438 |
2438 |
2439 if (!adapter->netdev && netif_running(netdev)) { |
2439 if (!adapter->netdev && netif_running(netdev)) { |
2440 /* No need to loop, because 82542 supports only 1 queue */ |
2440 /* No need to loop, because 82542 supports only 1 queue */ |
2441 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2441 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2442 e1000_configure_rx(adapter); |
2442 e1000_configure_rx(adapter); |
2443 if (adapter->ecdev) { |
2443 if (adapter->ecdev) { |
2444 /* fill rx ring completely! */ |
2444 /* fill rx ring completely! */ |
2445 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2445 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2446 } else { |
2446 } else { |
2447 /* this one leaves the last ring element unallocated! */ |
2447 /* this one leaves the last ring element unallocated! */ |
2448 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
2448 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |