devices/forcedeth-2.6.19-ethercat.c
changeset 670 f57de4585a5f
parent 639 aa23c48dca2d
child 1011 a0759d0dded4
equal deleted inserted replaced
669:884a5b5b0163 670:f57de4585a5f
  2384 {
  2384 {
  2385 	struct fe_priv *np = netdev_priv(dev);
  2385 	struct fe_priv *np = netdev_priv(dev);
  2386 
  2386 
  2387     if (np->ecdev) {
  2387     if (np->ecdev) {
  2388         int link = nv_update_linkspeed(dev);
  2388         int link = nv_update_linkspeed(dev);
  2389         ecdev_link_state(np->ecdev, link);
  2389         ecdev_set_link(np->ecdev, link);
  2390         return;
  2390         return;
  2391     }
  2391     }
  2392 
  2392 
  2393 	if (nv_update_linkspeed(dev)) {
  2393 	if (nv_update_linkspeed(dev)) {
  2394 		if (!netif_carrier_ok(dev)) {
  2394 		if (!netif_carrier_ok(dev)) {
  4218 	ret = nv_update_linkspeed(dev);
  4218 	ret = nv_update_linkspeed(dev);
  4219 	nv_start_rx(dev);
  4219 	nv_start_rx(dev);
  4220 	nv_start_tx(dev);
  4220 	nv_start_tx(dev);
  4221 
  4221 
  4222 	if (np->ecdev) {
  4222 	if (np->ecdev) {
  4223 		ecdev_link_state(np->ecdev, ret);
  4223 		ecdev_set_link(np->ecdev, ret);
  4224 	}
  4224 	}
  4225 	else {
  4225 	else {
  4226 		netif_start_queue(dev);
  4226 		netif_start_queue(dev);
  4227 		netif_poll_enable(dev);
  4227 		netif_poll_enable(dev);
  4228 
  4228