devices/e1000/e1000_main-2.6.22-ethercat.c
branchstable-1.3
changeset 1756 dbe4a4219aa5
parent 1754 e750b37597ad
child 1757 c5757cebfaea
equal deleted inserted replaced
1755:18141b8631be 1756:dbe4a4219aa5
  4360 				  ((uint32_t)(rx_desc->errors) << 24),
  4360 				  ((uint32_t)(rx_desc->errors) << 24),
  4361 				  le16_to_cpu(rx_desc->csum), skb);
  4361 				  le16_to_cpu(rx_desc->csum), skb);
  4362 
  4362 
  4363 		if (adapter->ecdev) {
  4363 		if (adapter->ecdev) {
  4364 			ecdev_receive(adapter->ecdev, skb->data, length);
  4364 			ecdev_receive(adapter->ecdev, skb->data, length);
       
  4365 
       
  4366 			// No need to detect link status as
       
  4367 			// long as frames are received: Reset watchdog.
       
  4368 			adapter->ec_watchdog_jiffies = jiffies;
  4365 		} else {
  4369 		} else {
  4366 			skb->protocol = eth_type_trans(skb, netdev);
  4370 			skb->protocol = eth_type_trans(skb, netdev);
  4367 #ifdef CONFIG_E1000_NAPI
  4371 #ifdef CONFIG_E1000_NAPI
  4368 			if (unlikely(adapter->vlgrp &&
  4372 			if (unlikely(adapter->vlgrp &&
  4369 						(status & E1000_RXD_STAT_VP))) {
  4373 						(status & E1000_RXD_STAT_VP))) {