[PATCH] netif_carrier_* support for tlan

[PATCH] netif_carrier_* support for tlan

[Matt Mackall]

Add proper netif_carrier_* to tlan driver

 l-mpm/drivers/net/tlan.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/net/tlan.c~tlan-carrier drivers/net/tlan.c
--- l/drivers/net/tlan.c~tlan-carrier	2003-09-22 00:53:06.000000000 -0500
+++ l-mpm/drivers/net/tlan.c	2003-09-22 01:16:15.000000000 -0500
@@ -902,7 +902,9 @@ static int TLan_Init( struct net_device 
 			err );
 	}
 	dev->addr_len = 6;
-	
+
+	netif_carrier_off(dev);
+
 	/* Device methods */
 	dev->open = &TLan_Open;
 	dev->hard_start_xmit = &TLan_StartTx;
@@ -2227,6 +2229,8 @@ TLan_ResetAdapter( struct net_device *de
 
 	priv->tlanFullDuplex = FALSE;
 	priv->phyOnline=0;
+	netif_carrier_off(dev);
+
 /*  1.	Assert reset bit. */
 
 	data = inl(dev->base_addr + TLAN_HOST_CMD);
@@ -2390,6 +2394,7 @@ TLan_FinishReset( struct net_device *dev
 		}
 		outl( priv->rxListDMA, dev->base_addr + TLAN_CH_PARM );
 		outl( TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD );
+		netif_carrier_on(dev);
 	} else {
 		printk( "TLAN: %s: Link inactive, will retry in 10 secs...\n", dev->name );
 		TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );

_


-- 
Matt Mackall : http://www.selenic.com : of or relating to the moon

Re: [PATCH] netif_carrier_* support for tlan

[Jeff Garzik]

applied to 2.4 and 2.5