aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>2008-10-05 11:14:27 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-05 11:14:27 -0700
commit25532824fb727744a302edb25c6a6ac10b82cb63 (patch)
treea5befc555aa10352c8407639f2a97ea026a3b247
parent7afb9dc9a5663befea612b03615efc694d5c3ce7 (diff)
Phonet: modules auto-loading support
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/phonet/af_phonet.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index 1d8df6b7e3d..0a74aeaf5ad 100644
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -64,6 +64,11 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
}
pnp = phonet_proto_get(protocol);
+#ifdef CONFIG_KMOD
+ if (pnp == NULL &&
+ request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0)
+ pnp = phonet_proto_get(protocol);
+#endif
if (pnp == NULL)
return -EPROTONOSUPPORT;
if (sock->type != pnp->sock_type) {
@@ -94,7 +99,7 @@ out:
}
static struct net_proto_family phonet_proto_family = {
- .family = AF_PHONET,
+ .family = PF_PHONET,
.create = pn_socket_create,
.owner = THIS_MODULE,
};
@@ -447,7 +452,7 @@ static int __init phonet_init(void)
err:
phonet_sysctl_exit();
- sock_unregister(AF_PHONET);
+ sock_unregister(PF_PHONET);
dev_remove_pack(&phonet_packet_type);
phonet_device_exit();
return err;
@@ -457,7 +462,7 @@ static void __exit phonet_exit(void)
{
isi_unregister();
phonet_sysctl_exit();
- sock_unregister(AF_PHONET);
+ sock_unregister(PF_PHONET);
dev_remove_pack(&phonet_packet_type);
phonet_device_exit();
}
@@ -466,3 +471,4 @@ module_init(phonet_init);
module_exit(phonet_exit);
MODULE_DESCRIPTION("Phonet protocol stack for Linux");
MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_PHONET);