patch-2.3.99-pre2 linux/drivers/net/wan/comx.c

• Lines: 54
• Date: Fri Mar 17 14:19:42 2000
• Orig file: v2.3.99-pre1/linux/drivers/net/wan/comx.c
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/drivers/net/wan/comx.c linux/drivers/net/wan/comx.c
@@ -432,7 +432,7 @@
 		ch->line_status & PROTO_UP ? "UP" : "DOWN");
 	len += sprintf(page + len, "Modem status changes: %lu, Transmitter status "
 		"is %s, tbusy: %d\n", ch->current_stats->tx_carrier_errors, ch->HW_txe ? 
-		ch->HW_txe(dev) ? "IDLE" : "BUSY" : "NOT READY", (int)dev->tbusy);
+		ch->HW_txe(dev) ? "IDLE" : "BUSY" : "NOT READY", netif_running(dev));
 	len += sprintf(page + len, "Interface load (input): %d / %d / %d bits/s (",
 		LOADAVG(0,0), LOADAVG(1, 0), LOADAVG(2, 0));
 	tmpstr[0] = 0;
@@ -860,7 +860,7 @@
 		return -EIO;
 	}
 
-	new_dir->ops = &proc_dir_inode_operations;  // ez egy normalis /proc konyvtar
+	new_dir->proc_iops = &proc_dir_inode_operations;  // ez egy normalis /proc konyvtar
 	new_dir->nlink = 2;
 	new_dir->data = NULL; // ide jon majd a struct dev
 
@@ -884,7 +884,7 @@
 	    S_IFREG | 0644, new_dir)) == NULL) {
 		return -ENOMEM;
 	}
-	debug_file->ops = &comx_debug_inode_ops;
+	debug_file->proc_iops = &comx_debug_inode_ops;
 	debug_file->data = (void *)debug_file; 
 	debug_file->read_proc = NULL; // see below
 	debug_file->write_proc = &comx_write_proc;
@@ -1027,7 +1027,7 @@
 	struct proc_dir_entry *new_file;
 
 	if ((new_file = create_proc_entry(name, S_IFREG | mode, dir)) != NULL) {
-		new_file->ops = &comx_normal_inode_ops;
+		new_file->proc_iops = &comx_normal_inode_ops;
 		new_file->data = (void *)new_file;
 		new_file->read_proc = &comx_read_proc;
 		new_file->write_proc = &comx_write_proc;
@@ -1129,7 +1129,7 @@
 #define comx_init init_module
 #endif
 
-__initfunc(int comx_init(void))
+int __init comx_init(void)
 {
 	struct proc_dir_entry *new_file;
 
@@ -1177,7 +1177,7 @@
 		return -ENOMEM;
 	}
 	
-	new_file->ops = &comx_normal_inode_ops;
+	new_file->proc_iops = &comx_normal_inode_ops;
 	new_file->data = new_file;
 	new_file->read_proc = &comx_root_read_proc;
 	new_file->write_proc = NULL;