patch-2.4.2 linux/drivers/net/pppox.c

• Lines: 62
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/pppox.c
• Orig date: Mon Oct 16 12:26:08 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/pppox.c linux/drivers/net/pppox.c
@@ -26,7 +26,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 
 #include <linux/netdevice.h>
@@ -38,7 +38,7 @@
 #include <linux/if_ppp.h>
 #include <linux/ppp_channel.h>
 
-static struct pppox_proto *proto[PX_MAX_PROTO+1] = { NULL, };
+static struct pppox_proto *proto[PX_MAX_PROTO+1];
 
 int register_pppox_proto(int proto_num, struct pppox_proto *pp)
 {
@@ -77,8 +77,8 @@
 EXPORT_SYMBOL(unregister_pppox_proto);
 EXPORT_SYMBOL(pppox_unbind_sock);
 
-int pppox_ioctl(struct socket* sock, unsigned int cmd,
-		unsigned long arg)
+static int pppox_ioctl(struct socket* sock, unsigned int cmd,
+		       unsigned long arg)
 {
 	struct sock *sk = sock->sk;
 	struct pppox_opt *po;
@@ -116,7 +116,7 @@
 }
 
 
-int pppox_create(struct socket *sock, int protocol)
+static int pppox_create(struct socket *sock, int protocol)
 {
 	int err = 0;
 
@@ -137,12 +137,12 @@
 	return err;
 }
 
-struct net_proto_family pppox_proto_family = {
+static struct net_proto_family pppox_proto_family = {
 	PF_PPPOX,
 	pppox_create
 };
 
-int __init pppox_init(void)
+static int __init pppox_init(void)
 {
 	int err = 0;
 
@@ -155,7 +155,7 @@
 	return err;
 }
 
-void __exit pppox_exit(void)
+static void __exit pppox_exit(void)
 {
 	sock_unregister(PF_PPPOX);
 }