o linux/net.h: bye bye struct net_proto

struct net_proto is not anymore needed, as the protocols
have their init functions marked as __init, not needing
explicit calling.

5 files changed, 1 insertions, 30 deletions

diff --git a/include/linux/atm.h b/include/linux/atm.h
index b5d4c29ba6c4..0380156f9c86 100644
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -236,15 +236,4 @@ struct atmif_sioc {
 };
 
 typedef unsigned short atm_backend_t;
-
-#ifdef __KERNEL__
-
-#include <linux/net.h>	/* struct net_proto */
-
-
-void atmpvc_proto_init(struct net_proto *pro);
-void atmsvc_proto_init(struct net_proto *pro);
-
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index a4633c570266..948826892b82 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -158,8 +158,6 @@ enum {
 
 extern struct ppp_channel_ops pppoe_chan_ops;
 
-extern int pppox_proto_init(struct net_proto *np);
-
 #endif /* __KERNEL__ */
 
 #endif /* !(__LINUX_IF_PPPOX_H) */
diff --git a/include/linux/inet.h b/include/linux/inet.h
index ffbfe45a365d..af4fa41bd632 100644
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -43,11 +43,6 @@
 #define _LINUX_INET_H
 
 #ifdef __KERNEL__
-
-#include <linux/net.h>
-
-extern void		inet_proto_init(struct net_proto *pro);
-extern __u32		in_aton(const char *str);
-
+extern __u32 in_aton(const char *str);
 #endif
 #endif	/* _LINUX_INET_H */
diff --git a/include/linux/net.h b/include/linux/net.h
index a670cf44fa9f..55083c938298 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -136,16 +136,6 @@ struct net_proto_family {
 	short	encrypt_net;
 };
 
-/**
- *  struct socket - network interface with the file system
- *  @name - Protocol name
- *  @init_func - Bootstrap
- */
-struct net_proto {
-	const char *name;
-	void	  (*init_func)(struct net_proto *pro);
-};
-
 extern int	     sock_wake_async(struct socket *sk, int how, int band);
 extern int	     sock_register(struct net_proto_family *fam);
 extern int	     sock_unregister(int family);
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index d526b746b4b9..db82099b2b17 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -1,6 +1,5 @@
 #ifndef __LINUX_NET_AFUNIX_H
 #define __LINUX_NET_AFUNIX_H
-extern void unix_proto_init(struct net_proto *pro);
 extern void unix_inflight(struct file *fp);
 extern void unix_notinflight(struct file *fp);
 typedef struct sock unix_socket;