equal
deleted
inserted
replaced
261 int irq_flags = IRQF_SHARED; |
261 int irq_flags = IRQF_SHARED; |
262 int err; |
262 int err; |
263 |
263 |
264 if (adapter->ecdev) |
264 if (adapter->ecdev) |
265 return 0; |
265 return 0; |
266 |
266 |
267 if (hw->mac_type >= e1000_82571) { |
267 if (hw->mac_type >= e1000_82571) { |
268 adapter->have_msi = !pci_enable_msi(adapter->pdev); |
268 adapter->have_msi = !pci_enable_msi(adapter->pdev); |
269 if (adapter->have_msi) { |
269 if (adapter->have_msi) { |
270 handler = e1000_intr_msi; |
270 handler = e1000_intr_msi; |
271 irq_flags = 0; |
271 irq_flags = 0; |
323 { |
323 { |
324 struct e1000_hw *hw = &adapter->hw; |
324 struct e1000_hw *hw = &adapter->hw; |
325 |
325 |
326 if (adapter->ecdev) |
326 if (adapter->ecdev) |
327 return; |
327 return; |
328 |
328 |
329 ew32(IMS, IMS_ENABLE_MASK); |
329 ew32(IMS, IMS_ENABLE_MASK); |
330 E1000_WRITE_FLUSH(); |
330 E1000_WRITE_FLUSH(); |
331 } |
331 } |
332 |
332 |
333 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
333 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
2318 |
2318 |
2319 if (!adapter->netdev && netif_running(netdev)) { |
2319 if (!adapter->netdev && netif_running(netdev)) { |
2320 /* No need to loop, because 82542 supports only 1 queue */ |
2320 /* No need to loop, because 82542 supports only 1 queue */ |
2321 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2321 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2322 e1000_configure_rx(adapter); |
2322 e1000_configure_rx(adapter); |
2323 if (adapter->ecdev) { |
2323 if (adapter->ecdev) { |
2324 /* fill rx ring completely! */ |
2324 /* fill rx ring completely! */ |
2325 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2325 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2326 } else { |
2326 } else { |
2327 /* this one leaves the last ring element unallocated! */ |
2327 /* this one leaves the last ring element unallocated! */ |
2328 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
2328 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |