devices/e100-2.6.24-ethercat.c
changeset 1316 d01d9cce8b59
parent 1311 bf7c62bc533f
child 1317 09173a2de40c
equal deleted inserted replaced
1315:26b4f94cfdfb 1316:d01d9cce8b59
  2200 		goto err_clean_cbs;
  2200 		goto err_clean_cbs;
  2201 	e100_set_multicast_list(nic->netdev);
  2201 	e100_set_multicast_list(nic->netdev);
  2202 	e100_start_receiver(nic, NULL);
  2202 	e100_start_receiver(nic, NULL);
  2203 	if (!nic->ecdev) {
  2203 	if (!nic->ecdev) {
  2204 		mod_timer(&nic->watchdog, jiffies);
  2204 		mod_timer(&nic->watchdog, jiffies);
  2205 		if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2205 	}
  2206 						nic->netdev->name, nic->netdev)))
  2206 	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2207 			goto err_no_irq;
  2207 					nic->netdev->name, nic->netdev)))
       
  2208 		goto err_no_irq;
       
  2209 	if (!nic->ecdev) {
  2208 		netif_wake_queue(nic->netdev);
  2210 		netif_wake_queue(nic->netdev);
  2209 		napi_enable(&nic->napi);
  2211 		napi_enable(&nic->napi);
  2210 		/* enable ints _after_ enabling poll, preventing a race between
  2212 		/* enable ints _after_ enabling poll, preventing a race between
  2211 		 * disable ints+schedule */
  2213 		 * disable ints+schedule */
  2212 		e100_enable_irq(nic);
  2214 		e100_enable_irq(nic);