devices/e100-2.6.26-ethercat.c
changeset 1316 d01d9cce8b59
parent 1311 bf7c62bc533f
child 1317 09173a2de40c
equal deleted inserted replaced
1315:26b4f94cfdfb 1316:d01d9cce8b59
  2271 		goto err_clean_cbs;
  2271 		goto err_clean_cbs;
  2272 	e100_set_multicast_list(nic->netdev);
  2272 	e100_set_multicast_list(nic->netdev);
  2273 	e100_start_receiver(nic, NULL);
  2273 	e100_start_receiver(nic, NULL);
  2274 	if (!nic->ecdev) {
  2274 	if (!nic->ecdev) {
  2275 		mod_timer(&nic->watchdog, jiffies);
  2275 		mod_timer(&nic->watchdog, jiffies);
  2276 		if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2276 	}
  2277 						nic->netdev->name, nic->netdev)))
  2277 	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2278 			goto err_no_irq;
  2278 					nic->netdev->name, nic->netdev)))
       
  2279 		goto err_no_irq;
       
  2280 	if (!nic->ecdev) {
  2279 		netif_wake_queue(nic->netdev);
  2281 		netif_wake_queue(nic->netdev);
  2280 		napi_enable(&nic->napi);
  2282 		napi_enable(&nic->napi);
  2281 		/* enable ints _after_ enabling poll, preventing a race between
  2283 		/* enable ints _after_ enabling poll, preventing a race between
  2282 		 * disable ints+schedule */
  2284 		 * disable ints+schedule */
  2283 		e100_enable_irq(nic);
  2285 		e100_enable_irq(nic);