devices/e1000/e1000_main-2.6.20-ethercat.c
changeset 1152 30f168c7f74f
parent 1011 a0759d0dded4
child 1154 04bcd38cf8dc
equal deleted inserted replaced
1151:1fc1535dec29 1152:30f168c7f74f
  4393 				  ((uint32_t)(rx_desc->errors) << 24),
  4393 				  ((uint32_t)(rx_desc->errors) << 24),
  4394 				  le16_to_cpu(rx_desc->csum), skb);
  4394 				  le16_to_cpu(rx_desc->csum), skb);
  4395 
  4395 
  4396 		if (adapter->ecdev) {
  4396 		if (adapter->ecdev) {
  4397 			ecdev_receive(adapter->ecdev, skb->data, length);
  4397 			ecdev_receive(adapter->ecdev, skb->data, length);
       
  4398 
       
  4399 			// No need to detect link status as
       
  4400 			// long as frames are received: Reset watchdog.
       
  4401 			adapter->ec_watchdog_jiffies = jiffies;
  4398 		} else {
  4402 		} else {
  4399 			skb->protocol = eth_type_trans(skb, netdev);
  4403 			skb->protocol = eth_type_trans(skb, netdev);
  4400 #ifdef CONFIG_E1000_NAPI
  4404 #ifdef CONFIG_E1000_NAPI
  4401 			if (unlikely(adapter->vlgrp &&
  4405 			if (unlikely(adapter->vlgrp &&
  4402 						(status & E1000_RXD_STAT_VP))) {
  4406 						(status & E1000_RXD_STAT_VP))) {