patch-2.4.0-test3 linux/net/atm/proc.c

• Lines: 49
• Date: Sat Jul 8 19:26:13 2000
• Orig file: v2.4.0-test2/linux/net/atm/proc.c
• Orig date: Mon Mar 27 08:08:33 2000

diff -u --recursive --new-file v2.4.0-test2/linux/net/atm/proc.c linux/net/atm/proc.c
@@ -104,7 +104,7 @@
 		strcpy(buf,addr->sas_addr.pub);
 		len = strlen(addr->sas_addr.pub);
 		buf += len;
-		if (*addr->sas_addr.pub) {
+		if (*addr->sas_addr.prv) {
 			*buf++ = '+';
 			len++;
 		}
@@ -233,9 +233,10 @@
 	int i;
 
 	if (!vcc->dev)
-		sprintf(buf,sizeof(void *) == 4 ? "N/A@%p%6s" : "N/A@%p%2s",
+		sprintf(buf,sizeof(void *) == 4 ? "N/A@%p%10s" : "N/A@%p%2s",
 		    vcc,"");
-	else sprintf(buf,"%3d %3d %5d ",vcc->dev->number,vcc->vpi,vcc->vci);
+	else sprintf(buf,"%3d %3d %5d         ",vcc->dev->number,vcc->vpi,
+		    vcc->vci);
 	here = strchr(buf,0);
 	here += sprintf(here,"%-10s ",vcc_state(vcc));
 	here += sprintf(here,"%s%s",vcc->remote.sas_addr.pub,
@@ -376,7 +377,7 @@
 	int left;
 
 	if (!pos)
-		return sprintf(buf,"Itf VPI VCI   State      Remote\n");
+		return sprintf(buf,"Itf VPI VCI           State      Remote\n");
 	left = pos-1;
 	for (dev = atm_devs; dev; dev = dev->next)
 		for (vcc = dev->vccs; vcc; vcc = vcc->next)
@@ -558,6 +559,7 @@
 		goto fail0;
 	dev->proc_entry->data = dev;
 	dev->proc_entry->proc_fops = &proc_dev_atm_operations;
+	dev->proc_entry->owner = THIS_MODULE;
 	return 0;
 	kfree(dev->proc_entry);
 fail0:
@@ -578,7 +580,8 @@
     name = create_proc_entry(#name,0,atm_proc_root); \
     if (!name) goto cleanup; \
     name->data = atm_##name##_info; \
-    name->proc_fops = &proc_spec_atm_operations
+    name->proc_fops = &proc_spec_atm_operations; \
+    name->owner = THIS_MODULE
 
 
 int __init atm_proc_init(void)