aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/rose/af_rose.c')
-rw-r--r--net/rose/af_rose.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 9e279464c9d1..7a81a8ee8544 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1351,7 +1351,7 @@ static void *rose_info_start(struct seq_file *seq, loff_t *pos)
1351 spin_lock_bh(&rose_list_lock); 1351 spin_lock_bh(&rose_list_lock);
1352 if (*pos == 0) 1352 if (*pos == 0)
1353 return SEQ_START_TOKEN; 1353 return SEQ_START_TOKEN;
1354 1354
1355 i = 1; 1355 i = 1;
1356 sk_for_each(s, node, &rose_list) { 1356 sk_for_each(s, node, &rose_list) {
1357 if (i == *pos) 1357 if (i == *pos)
@@ -1365,10 +1365,10 @@ static void *rose_info_next(struct seq_file *seq, void *v, loff_t *pos)
1365{ 1365{
1366 ++*pos; 1366 ++*pos;
1367 1367
1368 return (v == SEQ_START_TOKEN) ? sk_head(&rose_list) 1368 return (v == SEQ_START_TOKEN) ? sk_head(&rose_list)
1369 : sk_next((struct sock *)v); 1369 : sk_next((struct sock *)v);
1370} 1370}
1371 1371
1372static void rose_info_stop(struct seq_file *seq, void *v) 1372static void rose_info_stop(struct seq_file *seq, void *v)
1373{ 1373{
1374 spin_unlock_bh(&rose_list_lock); 1374 spin_unlock_bh(&rose_list_lock);
@@ -1379,7 +1379,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
1379 char buf[11]; 1379 char buf[11];
1380 1380
1381 if (v == SEQ_START_TOKEN) 1381 if (v == SEQ_START_TOKEN)
1382 seq_puts(seq, 1382 seq_puts(seq,
1383 "dest_addr dest_call src_addr src_call dev lci neigh st vs vr va t t1 t2 t3 hb idle Snd-Q Rcv-Q inode\n"); 1383 "dest_addr dest_call src_addr src_call dev lci neigh st vs vr va t t1 t2 t3 hb idle Snd-Q Rcv-Q inode\n");
1384 1384
1385 else { 1385 else {
@@ -1392,7 +1392,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
1392 devname = "???"; 1392 devname = "???";
1393 else 1393 else
1394 devname = dev->name; 1394 devname = dev->name;
1395 1395
1396 seq_printf(seq, "%-10s %-9s ", 1396 seq_printf(seq, "%-10s %-9s ",
1397 rose2asc(&rose->dest_addr), 1397 rose2asc(&rose->dest_addr),
1398 ax2asc(buf, &rose->dest_call)); 1398 ax2asc(buf, &rose->dest_call));
@@ -1520,7 +1520,7 @@ static int __init rose_proto_init(void)
1520 char name[IFNAMSIZ]; 1520 char name[IFNAMSIZ];
1521 1521
1522 sprintf(name, "rose%d", i); 1522 sprintf(name, "rose%d", i);
1523 dev = alloc_netdev(sizeof(struct net_device_stats), 1523 dev = alloc_netdev(sizeof(struct net_device_stats),
1524 name, rose_setup); 1524 name, rose_setup);
1525 if (!dev) { 1525 if (!dev) {
1526 printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n"); 1526 printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n");