diff options
Diffstat (limited to 'drivers/net/tokenring/olympic.c')
| -rw-r--r-- | drivers/net/tokenring/olympic.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index a242d125b34..3a25e0434ae 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -1139,9 +1139,8 @@ static void olympic_set_rx_mode(struct net_device *dev)     	u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ;   	u8 options = 0;   	u8 __iomem *srb; -	struct dev_mc_list *dmi ;  +	struct dev_mc_list *dmi;  	unsigned char dev_mc_address[4] ;  -	int i ;   	writel(olympic_priv->srb,olympic_mmio+LAPA);  	srb=olympic_priv->olympic_lap + (olympic_priv->srb & (~0xf800)); @@ -1178,7 +1177,7 @@ static void olympic_set_rx_mode(struct net_device *dev)  	dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;  -	for (i=0,dmi=dev->mc_list;i < netdev_mc_count(dev); i++,dmi = dmi->next) { +	netdev_for_each_mc_addr(dmi, dev) {  		dev_mc_address[0] |= dmi->dmi_addr[2] ;   		dev_mc_address[1] |= dmi->dmi_addr[3] ;   		dev_mc_address[2] |= dmi->dmi_addr[4] ;   |