MODULE_ALIAS() in network families
Subsystems (8)
PATCH 2/3 MODULE_ALIAS() in network families
Name: MODULE_ALIAS inside modules: network protocols
Author: Rusty Russell
Status: Booted on 2.6.0-test4-bk3
D: Previously, default aliases were hardwired into modutils. Now they
D: should be inside the modules, using MODULE_ALIAS() (they will be overridden
D: by any user alias).
include/linux/net.h +3 -0
@@ -20,6 +20,7 @@#include <linux/config.h> #include <linux/wait.h> +#include <linux/stringify.h> struct poll_table_struct ;struct inode ;
@@ -243,6 +244,8 @@ static struct proto_ops name##_ops = { };#endif +#define MODULE_ALIAS_NETPROTO (proto) \ + MODULE_ALIAS("net-pf-" __stringify(proto))#endif /* __KERNEL__ */ #endif /* _LINUX_NET_H */
net/appletalk/ddp.c +1 -0
@@ -1876,3 +1876,4 @@ module_exit(atalk_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Alan Cox <[email protected]>" );MODULE_DESCRIPTION ("AppleTalk 0.20 for Linux NET4.0\n" ); +MODULE_ALIAS_NETPROTO (PF_APPLETALK );
net/atm/common.c +2 -0
@@ -1135,3 +1135,5 @@ module_init(atm_init);module_exit (atm_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_ATMPVC ); +MODULE_ALIAS_NETPROTO (PF_ATMSVC );
net/ax25/af_ax25.c +1 -0
@@ -1999,6 +1999,7 @@ module_init(ax25_init);MODULE_AUTHOR ("Jonathan Naylor G4KLX <[email protected]>" );MODULE_DESCRIPTION ("The amateur radio AX.25 link layer protocol" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_AX25 ); static void __exit ax25_exit(void) {
net/bluetooth/bnep/core.c +1 -0
@@ -711,3 +711,4 @@ module_exit(bnep_cleanup_module);MODULE_DESCRIPTION ("Bluetooth BNEP ver " VERSION );MODULE_AUTHOR ("David Libault <[email protected]>, Maxim Krasnyanskiy <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_PROTO (PF_BLUETOOTH );
net/decnet/af_decnet.c +1 -0
@@ -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" ;
net/econet/af_econet.c +1 -0
@@ -1115,3 +1115,4 @@ module_init(econet_proto_init);module_exit (econet_proto_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_ECONET );
net/ipv4/af_inet.c +1 -0
@@ -1248,3 +1248,4 @@ int __init ipv4_proc_init(void) return 0; }#endif /* CONFIG_PROC_FS */ +MODULE_ALIAS_NETPROTO (PF_INET );
net/ipv6/af_inet6.c +2 -0
@@ -893,3 +893,5 @@ static void inet6_exit(void) }module_exit (inet6_exit);#endif /* MODULE */ + +MODULE_ALIAS_NETPROTO (PF_INET6 );
net/ipx/af_ipx.c +1 -0
@@ -2020,3 +2020,4 @@ static void __exit ipx_proto_finito(voidmodule_init (ipx_init);module_exit (ipx_proto_finito);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_IPX );
net/irda/irsyms.c +1 -0
@@ -351,3 +351,4 @@ MODULE_LICENSE("GPL");#ifdef CONFIG_IRDA_DEBUG MODULE_PARM (irda_debug,"1l" );#endif +MODULE_ALIAS_NETPROTO (PF_IRDA );
net/key/af_key.c +1 -0
@@ -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 );
net/llc/llc_main.c +1 -0
@@ -603,3 +603,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 );
net/netlink/af_netlink.c +1 -0
@@ -1086,3 +1086,4 @@ core_initcall(netlink_proto_init);module_exit (netlink_proto_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_NETLINK );
net/netrom/af_netrom.c +1 -0
@@ -1458,6 +1458,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NEMODULE_AUTHOR ("Jonathan Naylor G4KLX <[email protected]>" );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) {
net/packet/af_packet.c +1 -0
@@ -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 );
net/rose/af_rose.c +1 -0
@@ -1549,6 +1549,7 @@ MODULE_PARM_DESC(rose_ndevs, "number ofMODULE_AUTHOR ("Jonathan Naylor G4KLX <[email protected]>" );MODULE_DESCRIPTION ("The amateur radio ROSE network layer protocol" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_ROSE ); static void __exit rose_exit(void) {
net/unix/af_unix.c +1 -0
@@ -1965,3 +1965,4 @@ module_init(af_unix_init);module_exit (af_unix_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_UNIX );
net/wanrouter/af_wanpipe.c +1 -0
@@ -2600,3 +2600,4 @@ int init_module(void) }#endif MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_WANPIPE );
net/x25/af_x25.c +1 -0
@@ -1421,3 +1421,4 @@ module_exit(x25_exit);MODULE_AUTHOR ("Jonathan Naylor <[email protected]>" );MODULE_DESCRIPTION ("The X.25 Packet Layer network layer protocol" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_NETPROTO (PF_X25 );
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
Quoted 7 lines · On Tue, 02 Sep 2003 18:18:05 +1000 Rusty Russell <[email protected]> wrote:
Name:
MODULE_ALIASinside modules: network protocols
Author: Rusty Russell
Status: Booted on 2.6.0-test4-bk3D: Previously, default aliases were hardwired into modutils. Now they
D: should be inside the modules, usingMODULE_ALIAS()(they will be overridden
D: by any user alias).
Looks great, applied.
Thanks Rusty.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 7 lines · On Tue, 02 Sep 2003 18:18:05 +1000 Rusty Russell <[email protected]> wrote:
Name:
MODULE_ALIASinside modules: network protocols
Author: Rusty Russell
Status: Booted on 2.6.0-test4-bk3D: Previously, default aliases were hardwired into modutils. Now they
D: should be inside the modules, usingMODULE_ALIAS()(they will be overridden
D: by any user alias).
Looks great, applied.
Thanks Rusty.