patch-2.4.0-test2 linux/drivers/net/ppp_generic.c

Next file: linux/drivers/net/ptifddi.c
Previous file: linux/drivers/net/plip.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/ppp_generic.c linux/drivers/net/ppp_generic.c
@@ -312,7 +312,6 @@
 	 */
 	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -333,7 +332,6 @@
 			}
 		}
 	}
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -697,6 +695,7 @@
 }
 
 static struct file_operations ppp_device_fops = {
+	owner:		THIS_MODULE,
 	read:		ppp_read,
 	write:		ppp_write,
 	poll:		ppp_poll,
@@ -719,9 +718,9 @@
 	err = devfs_register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
 	if (err)
 		printk(KERN_ERR "failed to register PPP device (%d)\n", err);
-	devfs_handle = devfs_register(NULL, "ppp", 0, DEVFS_FL_NONE,
+	devfs_handle = devfs_register(NULL, "ppp", DEVFS_FL_DEFAULT,
 				      PPP_MAJOR, 0,
-				      S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+				      S_IFCHR | S_IRUSR | S_IWUSR,
 				      &ppp_device_fops, NULL);
 
 	return 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)