Commit 62350638 authored by Stefan Rompf's avatar Stefan Rompf Committed by Jeff Garzik

[netdrvr starfire] add netif_carrier_{on,off} calls

parent 542e3ab3
...@@ -905,6 +905,7 @@ static int netdev_open(struct net_device *dev) ...@@ -905,6 +905,7 @@ static int netdev_open(struct net_device *dev)
return -ENOMEM; return -ENOMEM;
} }
netif_carrier_off(dev);
init_ring(dev); init_ring(dev);
/* Set the size of the Rx buffers. */ /* Set the size of the Rx buffers. */
writel((np->rx_buf_sz << RxBufferLenShift) | writel((np->rx_buf_sz << RxBufferLenShift) |
...@@ -1587,6 +1588,7 @@ static void netdev_media_change(struct net_device *dev) ...@@ -1587,6 +1588,7 @@ static void netdev_media_change(struct net_device *dev)
else else
np->mii_if.full_duplex = 0; np->mii_if.full_duplex = 0;
} }
netif_carrier_on(dev);
printk(KERN_DEBUG "%s: Link is up, running at %sMbit %s-duplex\n", printk(KERN_DEBUG "%s: Link is up, running at %sMbit %s-duplex\n",
dev->name, dev->name,
np->speed100 ? "100" : "10", np->speed100 ? "100" : "10",
...@@ -1602,6 +1604,7 @@ static void netdev_media_change(struct net_device *dev) ...@@ -1602,6 +1604,7 @@ static void netdev_media_change(struct net_device *dev)
writel(np->tx_mode, ioaddr + TxMode); writel(np->tx_mode, ioaddr + TxMode);
} }
} else { } else {
netif_carrier_off(dev);
printk(KERN_DEBUG "%s: Link is down\n", dev->name); printk(KERN_DEBUG "%s: Link is down\n", dev->name);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment