diff options
Diffstat (limited to 'net/decnet/dn_dev.c')
-rw-r--r-- | net/decnet/dn_dev.c | 85 |
1 files changed, 41 insertions, 44 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 5c2a9951b638..764a56a13e38 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -799,9 +799,10 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
799 | skip_ndevs = cb->args[0]; | 799 | skip_ndevs = cb->args[0]; |
800 | skip_naddr = cb->args[1]; | 800 | skip_naddr = cb->args[1]; |
801 | 801 | ||
802 | for (dev = dev_base, idx = 0; dev; dev = dev->next, idx++) { | 802 | idx = 0; |
803 | for_each_netdev(dev) { | ||
803 | if (idx < skip_ndevs) | 804 | if (idx < skip_ndevs) |
804 | continue; | 805 | goto cont; |
805 | else if (idx > skip_ndevs) { | 806 | else if (idx > skip_ndevs) { |
806 | /* Only skip over addresses for first dev dumped | 807 | /* Only skip over addresses for first dev dumped |
807 | * in this iteration (idx == skip_ndevs) */ | 808 | * in this iteration (idx == skip_ndevs) */ |
@@ -809,18 +810,20 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
809 | } | 810 | } |
810 | 811 | ||
811 | if ((dn_db = dev->dn_ptr) == NULL) | 812 | if ((dn_db = dev->dn_ptr) == NULL) |
812 | continue; | 813 | goto cont; |
813 | 814 | ||
814 | for (ifa = dn_db->ifa_list, dn_idx = 0; ifa; | 815 | for (ifa = dn_db->ifa_list, dn_idx = 0; ifa; |
815 | ifa = ifa->ifa_next, dn_idx++) { | 816 | ifa = ifa->ifa_next, dn_idx++) { |
816 | if (dn_idx < skip_naddr) | 817 | if (dn_idx < skip_naddr) |
817 | continue; | 818 | goto cont; |
818 | 819 | ||
819 | if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, | 820 | if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, |
820 | cb->nlh->nlmsg_seq, RTM_NEWADDR, | 821 | cb->nlh->nlmsg_seq, RTM_NEWADDR, |
821 | NLM_F_MULTI) < 0) | 822 | NLM_F_MULTI) < 0) |
822 | goto done; | 823 | goto done; |
823 | } | 824 | } |
825 | cont: | ||
826 | idx++; | ||
824 | } | 827 | } |
825 | done: | 828 | done: |
826 | cb->args[0] = idx; | 829 | cb->args[0] = idx; |
@@ -1296,7 +1299,7 @@ void dn_dev_devices_off(void) | |||
1296 | struct net_device *dev; | 1299 | struct net_device *dev; |
1297 | 1300 | ||
1298 | rtnl_lock(); | 1301 | rtnl_lock(); |
1299 | for(dev = dev_base; dev; dev = dev->next) | 1302 | for_each_netdev(dev) |
1300 | dn_dev_down(dev); | 1303 | dn_dev_down(dev); |
1301 | rtnl_unlock(); | 1304 | rtnl_unlock(); |
1302 | 1305 | ||
@@ -1307,7 +1310,7 @@ void dn_dev_devices_on(void) | |||
1307 | struct net_device *dev; | 1310 | struct net_device *dev; |
1308 | 1311 | ||
1309 | rtnl_lock(); | 1312 | rtnl_lock(); |
1310 | for(dev = dev_base; dev; dev = dev->next) { | 1313 | for_each_netdev(dev) { |
1311 | if (dev->flags & IFF_UP) | 1314 | if (dev->flags & IFF_UP) |
1312 | dn_dev_up(dev); | 1315 | dn_dev_up(dev); |
1313 | } | 1316 | } |
@@ -1325,62 +1328,56 @@ int unregister_dnaddr_notifier(struct notifier_block *nb) | |||
1325 | } | 1328 | } |
1326 | 1329 | ||
1327 | #ifdef CONFIG_PROC_FS | 1330 | #ifdef CONFIG_PROC_FS |
1328 | static inline struct net_device *dn_dev_get_next(struct seq_file *seq, struct net_device *dev) | 1331 | static inline int is_dn_dev(struct net_device *dev) |
1329 | { | 1332 | { |
1330 | do { | 1333 | return dev->dn_ptr != NULL; |
1331 | dev = dev->next; | ||
1332 | } while(dev && !dev->dn_ptr); | ||
1333 | |||
1334 | return dev; | ||
1335 | } | 1334 | } |
1336 | 1335 | ||
1337 | static struct net_device *dn_dev_get_idx(struct seq_file *seq, loff_t pos) | 1336 | static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos) |
1338 | { | 1337 | { |
1338 | int i; | ||
1339 | struct net_device *dev; | 1339 | struct net_device *dev; |
1340 | 1340 | ||
1341 | dev = dev_base; | 1341 | read_lock(&dev_base_lock); |
1342 | if (dev && !dev->dn_ptr) | ||
1343 | dev = dn_dev_get_next(seq, dev); | ||
1344 | if (pos) { | ||
1345 | while(dev && (dev = dn_dev_get_next(seq, dev))) | ||
1346 | --pos; | ||
1347 | } | ||
1348 | return dev; | ||
1349 | } | ||
1350 | 1342 | ||
1351 | static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos) | 1343 | if (*pos == 0) |
1352 | { | 1344 | return SEQ_START_TOKEN; |
1353 | if (*pos) { | 1345 | |
1354 | struct net_device *dev; | 1346 | i = 1; |
1355 | read_lock(&dev_base_lock); | 1347 | for_each_netdev(dev) { |
1356 | dev = dn_dev_get_idx(seq, *pos - 1); | 1348 | if (!is_dn_dev(dev)) |
1357 | if (dev == NULL) | 1349 | continue; |
1358 | read_unlock(&dev_base_lock); | 1350 | |
1359 | return dev; | 1351 | if (i++ == *pos) |
1352 | return dev; | ||
1360 | } | 1353 | } |
1361 | return SEQ_START_TOKEN; | 1354 | |
1355 | return NULL; | ||
1362 | } | 1356 | } |
1363 | 1357 | ||
1364 | static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 1358 | static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
1365 | { | 1359 | { |
1366 | struct net_device *dev = v; | 1360 | struct net_device *dev; |
1367 | loff_t one = 1; | ||
1368 | 1361 | ||
1369 | if (v == SEQ_START_TOKEN) { | ||
1370 | dev = dn_dev_seq_start(seq, &one); | ||
1371 | } else { | ||
1372 | dev = dn_dev_get_next(seq, dev); | ||
1373 | if (dev == NULL) | ||
1374 | read_unlock(&dev_base_lock); | ||
1375 | } | ||
1376 | ++*pos; | 1362 | ++*pos; |
1377 | return dev; | 1363 | |
1364 | dev = (struct net_device *)v; | ||
1365 | if (v == SEQ_START_TOKEN) | ||
1366 | dev = net_device_entry(&dev_base_head); | ||
1367 | |||
1368 | for_each_netdev_continue(dev) { | ||
1369 | if (!is_dn_dev(dev)) | ||
1370 | continue; | ||
1371 | |||
1372 | return dev; | ||
1373 | } | ||
1374 | |||
1375 | return NULL; | ||
1378 | } | 1376 | } |
1379 | 1377 | ||
1380 | static void dn_dev_seq_stop(struct seq_file *seq, void *v) | 1378 | static void dn_dev_seq_stop(struct seq_file *seq, void *v) |
1381 | { | 1379 | { |
1382 | if (v && v != SEQ_START_TOKEN) | 1380 | read_unlock(&dev_base_lock); |
1383 | read_unlock(&dev_base_lock); | ||
1384 | } | 1381 | } |
1385 | 1382 | ||
1386 | static char *dn_type2asc(char type) | 1383 | static char *dn_type2asc(char type) |