[NET]: Use MODULE_ALIAS() in network families.

Previously, default aliases were hardwired into modutils.  Now they
should be inside the modules, using MODULE_ALIAS() (they will be overridden
by any user alias).

19 files changed, 21 insertions, 0 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 95f273f16a8a..4d5469bd8140 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1940,3 +1940,4 @@ module_exit(atalk_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>");
 MODULE_DESCRIPTION("AppleTalk 0.20 for Linux NET4.0\n");
+MODULE_ALIAS_NETPROTO(PF_APPLETALK);
diff --git a/net/atm/common.c b/net/atm/common.c
index b9a163bf9655..6fde6b018418 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -1136,3 +1136,5 @@ module_init(atm_init);
 module_exit(atm_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_ATMPVC);
+MODULE_ALIAS_NETPROTO(PF_ATMSVC);
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index d13771728f99..4bb3798a2638 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -2025,6 +2025,7 @@ module_init(ax25_init);
 MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
 MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_AX25);
 
 static void __exit ax25_exit(void)
 {
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 864e4e30d96c..4822fba968ba 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -711,3 +711,4 @@ module_exit(bnep_cleanup_module);
 MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION);
 MODULE_AUTHOR("David Libault <david.libault@inventel.fr>, Maxim Krasnyanskiy <maxk@qualcomm.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_PROTO(PF_BLUETOOTH);
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 296938c8cfca..bd664d07f201 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -2349,6 +2349,7 @@ void dn_unregister_sysctl(void);
 MODULE_DESCRIPTION("The Linux DECnet Network Protocol");
 MODULE_AUTHOR("Linux DECnet Project Team");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_DECnet);
 
 static char banner[] __initdata = KERN_INFO "NET4: DECnet for Linux: V.2.5.68s (C) 1995-2003 Linux DECnet Project Team\n";
 
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 5425b2d31904..b84afc5a8158 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -1116,3 +1116,4 @@ module_init(econet_proto_init);
 module_exit(econet_proto_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_ECONET);
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index bb7ebed8b0de..8a5dbadd51f3 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1248,3 +1248,4 @@ int __init ipv4_proc_init(void)
 	return 0;
 }
 #endif /* CONFIG_PROC_FS */
+MODULE_ALIAS_NETPROTO(PF_INET);
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index c2df59aec2fa..6289170cb341 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -893,3 +893,5 @@ static void inet6_exit(void)
 }
 module_exit(inet6_exit);
 #endif /* MODULE */
+
+MODULE_ALIAS_NETPROTO(PF_INET6);
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index e0a53bf2ea9e..083155a233a6 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -2021,3 +2021,4 @@ static void __exit ipx_proto_finito(void)
 module_init(ipx_init);
 module_exit(ipx_proto_finito);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_IPX);
diff --git a/net/irda/irsyms.c b/net/irda/irsyms.c
index 70baa3fbef5f..54def7ead679 100644
--- a/net/irda/irsyms.c
+++ b/net/irda/irsyms.c
@@ -351,3 +351,4 @@ MODULE_LICENSE("GPL");
 #ifdef CONFIG_IRDA_DEBUG
 MODULE_PARM(irda_debug, "1l");
 #endif
+MODULE_ALIAS_NETPROTO(PF_IRDA);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index ec9fe27e1e37..ed91a5f51335 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2844,3 +2844,4 @@ static int __init ipsec_pfkey_init(void)
 module_init(ipsec_pfkey_init);
 module_exit(ipsec_pfkey_exit);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_KEY);
diff --git a/net/llc/llc_main.c b/net/llc/llc_main.c
index 63f3d5961f89..3ee7b0aa16ae 100644
--- a/net/llc/llc_main.c
+++ b/net/llc/llc_main.c
@@ -604,3 +604,4 @@ module_exit(llc_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Procom, 1997, Arnaldo C. Melo, Jay Schullist, 2001-2003");
 MODULE_DESCRIPTION("LLC 2.0, NET4.0 IEEE 802.2 extended support");
+MODULE_ALIAS_NETPROTO(PF_LLC);
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 8cd678de82eb..e23847781517 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1086,3 +1086,4 @@ core_initcall(netlink_proto_init);
 module_exit(netlink_proto_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_NETLINK);
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 14be8d8dab1b..d332b90ccde6 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1460,6 +1460,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NET/ROM devices");
 MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
 MODULE_DESCRIPTION("The amateur radio NET/ROM network and transport layer protocol");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_NETROM);
 
 static void __exit nr_exit(void)
 {
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index e07cba1139bb..3b593a6e17d7 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1832,3 +1832,4 @@ static int __init packet_init(void)
 module_init(packet_init);
 module_exit(packet_exit);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_PACKET);
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index c860765f12a5..69ce7b8e01da 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1551,6 +1551,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of ROSE devices");
 MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
 MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_ROSE);
 
 static void __exit rose_exit(void)
 {
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index f249d4388e36..d9dd8a2f3914 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1965,3 +1965,4 @@ module_init(af_unix_init);
 module_exit(af_unix_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_UNIX);
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 4f49aa6edf08..02bc8d43fe52 100644
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -2600,3 +2600,4 @@ int init_module(void)
 }
 #endif
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_WANPIPE);
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 8c5018feed69..83b57963397e 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1423,3 +1423,4 @@ module_exit(x25_exit);
 MODULE_AUTHOR("Jonathan Naylor <g4klx@g4klx.demon.co.uk>");
 MODULE_DESCRIPTION("The X.25 Packet Layer network layer protocol");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_X25);