equal
deleted
inserted
replaced
21 |
21 |
22 Contact Information: |
22 Contact Information: |
23 Linux NICS <linux.nics@intel.com> |
23 Linux NICS <linux.nics@intel.com> |
24 e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> |
24 e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> |
25 Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
25 Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
26 |
26 |
27 vim: noexpandtab |
27 vim: noexpandtab |
28 |
28 |
29 *******************************************************************************/ |
29 *******************************************************************************/ |
30 |
30 |
31 #include "e1000-2.6.37-ethercat.h" |
31 #include "e1000-2.6.37-ethercat.h" |
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 |
335 |
336 ew32(IMS, IMS_ENABLE_MASK); |
336 ew32(IMS, IMS_ENABLE_MASK); |
337 E1000_WRITE_FLUSH(); |
337 E1000_WRITE_FLUSH(); |
338 } |
338 } |
339 |
339 |
340 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
340 static void e1000_update_mng_vlan(struct e1000_adapter *adapter) |
2158 |
2158 |
2159 if (!adapter->netdev && netif_running(netdev)) { |
2159 if (!adapter->netdev && netif_running(netdev)) { |
2160 /* No need to loop, because 82542 supports only 1 queue */ |
2160 /* No need to loop, because 82542 supports only 1 queue */ |
2161 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2161 struct e1000_rx_ring *ring = &adapter->rx_ring[0]; |
2162 e1000_configure_rx(adapter); |
2162 e1000_configure_rx(adapter); |
2163 if (adapter->ecdev) { |
2163 if (adapter->ecdev) { |
2164 /* fill rx ring completely! */ |
2164 /* fill rx ring completely! */ |
2165 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2165 adapter->alloc_rx_buf(adapter, ring, ring->count); |
2166 } else { |
2166 } else { |
2167 /* this one leaves the last ring element unallocated! */ |
2167 /* this one leaves the last ring element unallocated! */ |
2168 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |
2168 adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring)); |