diff options
Diffstat (limited to 'drivers/net/tlan.c')
| -rw-r--r-- | drivers/net/tlan.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 390540c101c..8ffec22b74b 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -1314,7 +1314,7 @@ static struct net_device_stats *TLan_GetStats( struct net_device *dev )  static void TLan_SetMulticastList( struct net_device *dev )  { -	struct dev_mc_list *dmi; +	struct netdev_hw_addr *ha;  	u32			hash1 = 0;  	u32			hash2 = 0;  	int			i; @@ -1336,12 +1336,12 @@ static void TLan_SetMulticastList( struct net_device *dev )  			TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, 0xFFFFFFFF );  		} else {  			i = 0; -			netdev_for_each_mc_addr(dmi, dev) { +			netdev_for_each_mc_addr(ha, dev) {  				if ( i < 3 ) {  					TLan_SetMac( dev, i + 1, -						     (char *) &dmi->dmi_addr ); +						     (char *) &ha->addr);  				} else { -					offset = TLan_HashFunc( (u8 *) &dmi->dmi_addr ); +					offset = TLan_HashFunc((u8 *)&ha->addr);  					if ( offset < 32 )  						hash1 |= ( 1 << offset );  					else @@ -2464,7 +2464,7 @@ static void TLan_PhyPrint( struct net_device *dev )  		printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );  	} else if ( phy <= TLAN_PHY_MAX_ADDR ) {  		printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy ); -		printk( "TLAN:      Off.  +0     +1     +2     +3 \n" ); +		printk( "TLAN:      Off.  +0     +1     +2     +3\n" );                  for ( i = 0; i < 0x20; i+= 4 ) {  			printk( "TLAN:      0x%02x", i );  			TLan_MiiReadReg( dev, phy, i, &data0 );  |