devices/forcedeth-2.6.17-ethercat.c
changeset 670 f57de4585a5f
parent 639 aa23c48dca2d
child 1011 a0759d0dded4
equal deleted inserted replaced
669:884a5b5b0163 670:f57de4585a5f
  2051 {
  2051 {
  2052 	struct fe_priv *np = netdev_priv(dev);
  2052 	struct fe_priv *np = netdev_priv(dev);
  2053 
  2053 
  2054     if (np->ecdev) {
  2054     if (np->ecdev) {
  2055         int link = nv_update_linkspeed(dev);
  2055         int link = nv_update_linkspeed(dev);
  2056         ecdev_link_state(np->ecdev, link);
  2056         ecdev_set_link(np->ecdev, link);
  2057         return;
  2057         return;
  2058     }
  2058     }
  2059 
  2059 
  2060 	if (nv_update_linkspeed(dev)) {
  2060 	if (nv_update_linkspeed(dev)) {
  2061 		if (!netif_carrier_ok(dev)) {
  2061 		if (!netif_carrier_ok(dev)) {
  2983 	ret = nv_update_linkspeed(dev);
  2983 	ret = nv_update_linkspeed(dev);
  2984 	nv_start_rx(dev);
  2984 	nv_start_rx(dev);
  2985 	nv_start_tx(dev);
  2985 	nv_start_tx(dev);
  2986 
  2986 
  2987 	if (np->ecdev) {
  2987 	if (np->ecdev) {
  2988 		ecdev_link_state(np->ecdev, ret);
  2988 		ecdev_set_link(np->ecdev, ret);
  2989 	}
  2989 	}
  2990 	else {
  2990 	else {
  2991 		netif_start_queue(dev);
  2991 		netif_start_queue(dev);
  2992 		if (ret) {
  2992 		if (ret) {
  2993 			netif_carrier_on(dev);
  2993 			netif_carrier_on(dev);