tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tokenring: convert to use netdev_for_each_mc_addr

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jiri Pirko and committed by
David S. Miller 16cad981 d5907942

+9 -17
+2 -3
drivers/net/tokenring/3c359.c
··· 1390 1390 static void xl_set_rx_mode(struct net_device *dev) 1391 1391 { 1392 1392 struct xl_private *xl_priv = netdev_priv(dev); 1393 - struct dev_mc_list *dmi ; 1393 + struct dev_mc_list *dmi; 1394 1394 unsigned char dev_mc_address[4] ; 1395 1395 u16 options ; 1396 - int i ; 1397 1396 1398 1397 if (dev->flags & IFF_PROMISC) 1399 1398 options = 0x0004 ; ··· 1407 1408 1408 1409 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1409 1410 1410 - for (i=0,dmi=dev->mc_list;i < netdev_mc_count(dev); i++,dmi = dmi->next) { 1411 + netdev_for_each_mc_addr(dmi, dev) { 1411 1412 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1412 1413 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1413 1414 dev_mc_address[2] |= dmi->dmi_addr[4] ;
+1 -3
drivers/net/tokenring/ibmtr.c
··· 995 995 /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/ 996 996 if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return; 997 997 address[0] = address[1] = address[2] = address[3] = 0; 998 - mclist = dev->mc_list; 999 - for (i = 0; i < netdev_mc_count(dev); i++) { 998 + netdev_for_each_mc_addr(mclist, dev) { 1000 999 address[0] |= mclist->dmi_addr[2]; 1001 1000 address[1] |= mclist->dmi_addr[3]; 1002 1001 address[2] |= mclist->dmi_addr[4]; 1003 1002 address[3] |= mclist->dmi_addr[5]; 1004 - mclist = mclist->next; 1005 1003 } 1006 1004 SET_PAGE(ti->srb_page); 1007 1005 for (i = 0; i < sizeof(struct srb_set_funct_addr); i++)
+1 -3
drivers/net/tokenring/lanstreamer.c
··· 1268 1268 __u8 options = 0; 1269 1269 struct dev_mc_list *dmi; 1270 1270 unsigned char dev_mc_address[5]; 1271 - int i; 1272 1271 1273 1272 writel(streamer_priv->srb, streamer_mmio + LAPA); 1274 1273 options = streamer_priv->streamer_copy_all_options; ··· 1302 1303 writel(streamer_priv->srb,streamer_mmio+LAPA); 1303 1304 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1304 1305 1305 - for (i=0,dmi=dev->mc_list;i < netdev_mc_count(dev); i++,dmi = dmi->next) 1306 - { 1306 + netdev_for_each_mc_addr(dmi, dev) { 1307 1307 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1308 1308 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1309 1309 dev_mc_address[2] |= dmi->dmi_addr[4] ;
+2 -3
drivers/net/tokenring/olympic.c
··· 1139 1139 u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; 1140 1140 u8 options = 0; 1141 1141 u8 __iomem *srb; 1142 - struct dev_mc_list *dmi ; 1142 + struct dev_mc_list *dmi; 1143 1143 unsigned char dev_mc_address[4] ; 1144 - int i ; 1145 1144 1146 1145 writel(olympic_priv->srb,olympic_mmio+LAPA); 1147 1146 srb=olympic_priv->olympic_lap + (olympic_priv->srb & (~0xf800)); ··· 1177 1178 1178 1179 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1179 1180 1180 - for (i=0,dmi=dev->mc_list;i < netdev_mc_count(dev); i++,dmi = dmi->next) { 1181 + netdev_for_each_mc_addr(dmi, dev) { 1181 1182 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1182 1183 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1183 1184 dev_mc_address[2] |= dmi->dmi_addr[4] ;
+3 -5
drivers/net/tokenring/tms380tr.c
··· 1212 1212 } 1213 1213 else 1214 1214 { 1215 - int i; 1216 - struct dev_mc_list *mclist = dev->mc_list; 1217 - for (i=0; i< netdev_mc_count(dev); i++) 1218 - { 1215 + struct dev_mc_list *mclist; 1216 + 1217 + netdev_for_each_mc_addr(mclist, dev) { 1219 1218 ((char *)(&tp->ocpl.FunctAddr))[0] |= 1220 1219 mclist->dmi_addr[2]; 1221 1220 ((char *)(&tp->ocpl.FunctAddr))[1] |= ··· 1223 1224 mclist->dmi_addr[4]; 1224 1225 ((char *)(&tp->ocpl.FunctAddr))[3] |= 1225 1226 mclist->dmi_addr[5]; 1226 - mclist = mclist->next; 1227 1227 } 1228 1228 } 1229 1229 tms380tr_exec_cmd(dev, OC_SET_FUNCT_ADDR);