| To: | Jeff Garzik <jgarzik@xxxxxxxxx> |
|---|---|
| Subject: | [PATCH 1/7] [au1000]: Use netif_carrier_* instead of IFF_RUNNING |
| From: | Thomas Graf <tgraf@xxxxxxx> |
| Date: | Mon, 28 Mar 2005 02:06:58 +0200 |
| Cc: | netdev@xxxxxxxxxxx, source@xxxxxxxxxx |
| In-reply-to: | <20050328000610.GN3086@xxxxxxxxxxxxxx> |
| References: | <20050328000610.GN3086@xxxxxxxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/28 00:06:22+02:00 tgraf@xxxxxxx
# [au1000]: Use netif_carrier_* instead of IFF_RUNNING
#
# Signed-off-by: Thomas Graf <tgraf@xxxxxxx>
#
# drivers/net/au1000_eth.c
# 2005/03/28 00:06:10+02:00 tgraf@xxxxxxx +2 -8
# [au1000]: Use netif_carrier_* instead of IFF_RUNNING
#
diff -Nru a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
--- a/drivers/net/au1000_eth.c 2005-03-28 01:08:16 +02:00
+++ b/drivers/net/au1000_eth.c 2005-03-28 01:08:16 +02:00
@@ -1681,10 +1681,6 @@
control |= MAC_FULL_DUPLEX;
}
- /* fix for startup without cable */
- if (!link)
- dev->flags &= ~IFF_RUNNING;
-
aup->mac->control = control;
aup->mac->vlan1_tag = 0x8100; /* activate vlan support */
au_sync();
@@ -1709,16 +1705,14 @@
if_port = dev->if_port;
if (aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed) == 0) {
if (link) {
- if (!(dev->flags & IFF_RUNNING)) {
+ if (!netif_carrier_ok) {
netif_carrier_on(dev);
- dev->flags |= IFF_RUNNING;
printk(KERN_INFO "%s: link up\n", dev->name);
}
}
else {
- if (dev->flags & IFF_RUNNING) {
+ if (netif_carrier_ok) {
netif_carrier_off(dev);
- dev->flags &= ~IFF_RUNNING;
dev->if_port = 0;
printk(KERN_INFO "%s: link down\n", dev->name);
}
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCHSET] IFF_RUNNING related fixes, Thomas Graf |
|---|---|
| Next by Date: | [PATCH 2/7] [bmac]: Remove obsolete usage of IFF_RUNING, Thomas Graf |
| Previous by Thread: | [PATCHSET] IFF_RUNNING related fixes, Thomas Graf |
| Next by Thread: | Re: [PATCH 1/7] [au1000]: Use netif_carrier_* instead of IFF_RUNNING, Thomas Graf |
| Indexes: | [Date] [Thread] [Top] [All Lists] |